up

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";