up

modules/home/git.nix

@@ -16,7 +16,6 @@ in {
         autocrlf = "input";
         pager = "delta";
       };
-      # commit.gpgsign = true;
       pull.rebase = true;
       rebase.autoStash = true;
       interactive.diffFilter = "delta --color-only";

modules/home/lazygit.nix

@@ -6,42 +6,42 @@
         commit.signOff = true;
         paging = {
           colorArg = "always";
-          pager = "DELTA_FEATURES=decorations delta --light --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format=\"lazygit-edit://{path}:{line}\"";
+          pager = "DELTA_FEATURES=decorations delta --dark --paging=never --line-numbers --hyperlinks --hyperlinks-file-link-format=\"lazygit-edit://{path}:{line}\"";
         };
       };
 
       gui = {
         authorColors = {
-          "*" = "#7287fd";
+          "*" = "#b4befe";
         };
         theme = {
           activeBorderColor = [
-            "#8839ef"
+            "#cba6f7"
             "bold"
           ];
           inactiveBorderColor = [
-            "#6c6f85"
+            "#a6adc8"
           ];
           optionsTextColor = [
-            "#1e66f5"
+            "#89b4fa"
           ];
           selectedLineBgColor = [
-            "#ccd0da"
+            "#313244"
           ];
           cherryPickedCommitBgColor = [
-            "#bcc0cc"
+            "#45475a"
           ];
           cherryPickedCommitFgColor = [
-            "#8839ef"
+            "#cba6f7"
           ];
           defaultFgColor = [
-            "#4c4f69"
+            "#cdd6f4"
           ];
           searchingActiveBorderColor = [
-            "#df8e1d"
+            "#f9e2af"
           ];
           unstagedChangesColor = [
-            "#d20f39"
+            "#f38ba8"
           ];
         };
       };

modules/home/neovim/default.nix

@@ -4,14 +4,15 @@
     ./mappings.nix
     ./options.nix
     ./plugins/blink-cmp.nix
-    ./plugins/harpoon.nix
     ./plugins/conform.nix
+    ./plugins/diffview.nix
     ./plugins/grug-far.nix
+    ./plugins/harpoon.nix
     ./plugins/lsp.nix
-    ./plugins/neogit.nix
     ./plugins/mini.nix
-    ./plugins/supermaven.nix
+    ./plugins/neogit.nix
     ./plugins/oil.nix
+    ./plugins/supermaven.nix
     ./plugins/toggleterm.nix
     ./plugins/treesitter.nix
   ];

modules/home/neovim/mappings.nix

@@ -94,6 +94,11 @@
       options.desc = "Symbols (LSP, buffer)";
     }
     # g - git
+    {
+      mode = "n";
+      key = "<leader>gd";
+      action = ":DiffviewOpen<CR>";
+    }
     {
       mode = "n";
       key = "<leader>gg";
@@ -104,7 +109,6 @@
       '';
       options.desc = "Neogit";
     }
-
     # l - lsp/formatter
     {
       mode = "n";

modules/home/neovim/plugins/diffview.nix

@@ -0,0 +1,5 @@
+{
+  programs.nixvim.plugins.diffview = {
+    enable = true;
+  };
+}

modules/home/neovim/plugins/mini.nix

@@ -148,5 +148,6 @@
       trailspace = {};
       visits = {};
     };
+    mockDevIcons = true;
   };
 }

modules/home/neovim/plugins/neogit.nix

@@ -5,9 +5,7 @@
       disable_signs = false;
       integrations = {
         diffview = true;
-        telescope = true;
       };
-      use_telescope = true;
     };
   };
 }

modules/home/neovim/plugins/oil.nix

@@ -2,9 +2,6 @@
   programs.nixvim.plugins.oil = {
     enable = true;
     settings = {
-      columns = [
-        "icon"
-      ];
       keymaps = {
         "<C-r>" = "actions.refresh";
         "<leader>qq" = "actions.close";

modules/home/starship.nix

@@ -5,7 +5,7 @@
     settings = {
       add_newline = true;
       command_timeout = 200;
-      format = "$directory$git_commit$git_branch$git_status$git_state$git_metrics$character";
+      format = "$directory$git_branch$git_commit$git_status$git_state$git_metrics\n$character";
       character = {
         error_symbol = "[✗ ](bold #e64553)";
         success_symbol = "[❯](bold #40a02b)[❯](bold #df8e1d)[❯](bold #dc8a78)";
@@ -16,6 +16,12 @@
         repo_root_style = "bold cyan";
         repo_root_format = "[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) ";
       };
+      git_branch = {
+        format = " @[$branch(:$remote_branch)]($style)";
+        symbol = "";
+        style = "bold #a6e3a1";
+        truncation_length = 28;
+      };
       git_commit = {
         commit_hash_length = 4;
         only_detached = false;
@@ -23,35 +29,30 @@
         format = " [$hash]($style)";
         style = "bold #89b4fa";
       };
-      git_branch = {
-        format = " [$symbol$branch(:$remote_branch)]($style)";
-        symbol = " ";
-        style = "bold #a6e3a1";
-        truncation_length = 28;
-      };
       git_status = {
         format = " [$ahead_behind$staged$modified$renamed$deleted$typechanged$untracked$stashed$conflicted]($style)";
         style = "bold #f9e2af";
-        conflicted = "✖$count";
-        ahead = "⇡$count";
-        behind = "⇣$count";
-        diverged = "⇕$ahead_count/$behind_count";
-        staged = "+$count";
-        modified = "~$count";
-        renamed = "»$count";
-        deleted = "×$count";
-        untracked = "?$count";
-        stashed = "⚑$count";
-        typechanged = "≋$count";
+        ahead = " a+$count";
+        behind = " b+$count";
+        diverged = " div:$ahead_count/$behind_count";
+        staged = " s:$count";
+        modified = " m:$count";
+        renamed = " r:$count";
+        deleted = " d:$count";
+        typechanged = " t:$count";
+        untracked = " u:$count";
+        stashed = " st:$count";
+        conflicted = " x:$count";
       };
       git_state = {
-        format = " [$state($progress_current/$progress_total)]($style)";
+        format = " {$state($progress_current/$progress_total)}($style)";
         style = "bold #f38ba8";
       };
       git_metrics = {
         disabled = false;
-        format = " [+$added/-$deleted]($style)";
-        style = "bold #94e2d5";
+        format = " [+$added]($added_style)/[-$deleted]($deleted_style)";
+        added_style = "bold #40a02b";
+        deleted_style = "bold #d20f39";
       };
     };
   };