stuff

profiles/base/home-manager/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./atuin.nix
     ./bat.nix
+    ./lazygit.nix
     ./eza.nix
     ./fish.nix
     ./git.nix

profiles/base/home-manager/lazygit.nix

@@ -0,0 +1,42 @@
+{
+  programs.lazygit = {
+    settings = {
+      gui = {
+        theme = {
+          activeBorderColor = [
+            "#8839ef"
+            "bold"
+          ];
+          inactiveBorderColor = [
+            "#6c6f85"
+          ];
+          optionsTextColor = [
+            "#1e66f5"
+          ];
+          selectedLineBgColor = [
+            "#ccd0da"
+          ];
+          cherryPickedCommitBgColor = [
+            "#bcc0cc"
+          ];
+          cherryPickedCommitFgColor = [
+            "#8839ef"
+          ];
+          unstagedChangesColor = [
+            "#d20f39"
+          ];
+          defaultFgColor = [
+            "#4c4f69"
+          ];
+          searchingActiveBorderColor = [
+            "#df8e1d"
+          ];
+        };
+
+        authorColors = {
+          "*" = "#7287fd";
+        };
+      };
+    };
+  };
+}

profiles/base/home-manager/neovim/options.nix

@@ -2,7 +2,7 @@
   programs.nixvim.globalOpts = {
     expandtab = true;
     shiftwidth = 2;
-    foldmethod = "expr";
+    # foldmethod = "expr";
-    foldexpr = "nvim_treesitter#foldexpr()";
+    # foldexpr = "nvim_treesitter#foldexpr()";
   };
 }

profiles/base/home-manager/starship.nix

@@ -8,7 +8,9 @@
 
       format = lib.concatStrings [
         "$directory"
-        "$\{custom.jj\}"
+        "$git_branch"
+        "$git_status"
+        "$git_metrics"
         "$line_break"
         "$character"
       ];
@@ -18,43 +20,14 @@
         error_symbol = "[❯](bold red)";
       };
 
-      custom.jj = {
+      git_branch = {
-        ignore_timeout = true;
+        format = " [ $branch]($style) ";
-        description = "The current jj status";
-        when = "jj root";
-        symbol = "🥋 ";
-        command = lib.concatStrings [
-          "jj log --revisions @ --no-graph --ignore-working-copy --color always --limit 1 --template '"
-          "separate(\" \","
-          "  change_id.shortest(4),"
-          "  bookmarks,"
-          "  \"|\","
-          "  concat("
-          "    if(conflict, \"💥\"),"
-          "    if(divergent, \"🚧\"),"
-          "    if(hidden, \"👻\"),"
-          "    if(immutable, \"🔒\"),"
-          "  ),"
-          "  raw_escape_sequence(\"\\x1b[1;32m\") ++ if(empty, \"(empty)\"),"
-          "  raw_escape_sequence(\"\\x1b[1;32m\") ++ coalesce("
-          "    truncate_end(29, description.first_line(), \"…\"),"
-          "    \"(no description set)\","
-          "  ) ++ raw_escape_sequence(\"\\x1b[0m\"),"
-          ")'"
-        ];
       };
 
-      git_state = {
-        disabled = true;
-      };
-      git_commit = {
-        disabled = true;
-      };
       git_metrics = {
-        disabled = true;
+        disabled = false;
-      };
+        added_style = "bold green";
-      git_branch = {
+        format = "[+$added]($added_style)/[-$deleted]($deleted_style) ";
-        disabled = true;
       };
     };
   };

profiles/base/packages.nix

@@ -2,7 +2,6 @@
 with pkgs; [
   age
   age-plugin-yubikey
-  lazygit
   alejandra
   delta
   docker