config/default.nix

@@ -28,7 +28,6 @@
     ./plugins/lsp/lsp.nix
 
     # Git
-    ./plugins/git/fugitive.nix
     ./plugins/git/gitsigns.nix
     ./plugins/git/lazygit.nix
 

config/plugins/git/fugitive.nix

@@ -1,8 +0,0 @@
-{ ... }:
-
-{
-  plugins.fugitive = {
-    enable = true;
-  };
-}
-

config/plugins/git/lazygit.nix

@@ -8,25 +8,10 @@
   keymaps = [
     {
       mode = "n";
-      key = "<leader>gg";
+      key = "<leader>lg";
       action = "<cmd>LazyGit<cr>";
-      options = {
-        desc = "Open LazyGit";
-      };
-    }
-
-    {
-      mode = "n";
-      key = "<leader>lr";
-      action = "<cmd>lua require(\"telescope\").extensions.lazygit.lazygit()<cr>";
-      options = {
-        desc = "List repositories";
-      };
+      options.desc = "LazyGit";
     }
   ];
-
-  extraConfigLua = ''
-    require("telescope").load_extension("lazygit")
-  '';
 }
 

config/plugins/utils/telescope.nix

@@ -19,77 +19,40 @@
 
     # Configure our telescope keymaps.
     keymaps = {
-      # File Pickers
       "<leader>ff" = {
         action = "find_files";
         options = {
           desc = "Find project files";
         };
       };
+      "<leader>fb" = {
+        action = "buffers";
+        options = {
+          desc = "Find open buffers";
+        };
+      };
       "<leader>/" = {
         action = "live_grep";
         options = {
           desc = "Grep (root dir)";
         };
       };
-
-      # Vim Pickers
-      "<leader>fb" = {
-        action = "buffers";
-        options = {
-          desc = "Find open buffers";
-        };
-      };
       "<leader>:" = {
         action = "command_history";
         options = {
           desc = "Command History";
         };
       };
+      "<leader>p" = {
+        action = "neoclip";
+        options.desc = "Persistent Clipboard";
+      };
       "<leader>sc" = {
         action = "commands";
         options = {
           desc = "Search Commands";
         };
       };
-
-      # Git Pickers
-      "<leader>lc" = {
-        action = "git_bcommits";
-        options = {
-          desc = "List buffers commits";
-        };
-      };
-      "<leader>lC" = {
-        action = "git_commits";
-        options = {
-          desc = "List git commits";
-        };
-      };
-      "<leader>lb" = {
-        action = "git_branches";
-        options = {
-          desc = "List git branches";
-        };
-      };
-      "<leader>ld" = {
-        action = "git_status";
-        options = {
-          desc = "List git diff";
-        };
-      };
-      "<leader>ls" = {
-        action = "git_stash";
-        options = {
-          desc = "List git stash";
-        };
-      };
-
-      # Extensions
-      "<leader>p" = {
-        action = "neoclip";
-        options.desc = "Persistent Clipboard";
-      };
       "<leader>sl" = {
         action = "software-licenses find";
         options = {

config/plugins/utils/whichkey.nix

@@ -4,80 +4,5 @@
   plugins.which-key = {
     enable = true;
   };
-
-  # Prefixes, No operation.
-  keymaps = [
-    {
-      mode = "n";
-      key = "<leader>f";
-      action = "<Nop>";
-      options = {
-        desc = "+find/files";
-      };
-    }
-
-    {
-      mode = "n";
-      key = "<leader>s";
-      action = "<Nop>";
-      options = {
-        desc = "+search";
-      };
-    }
-
-    {
-      mode = "n";
-      key = "<leader>h";
-      action = "<Nop>";
-      options = {
-        desc = "+hunks";
-      };
-    }
-
-    {
-      mode = "n";
-      key = "<leader>t";
-      action = "<Nop>";
-      options = {
-        desc = "+toggle";
-      };
-    }
-
-    {
-      mode = "n";
-      key = "<leader>b";
-      action = "<Nop>";
-      options = {
-        desc = "+buffer";
-      };
-    }
-
-    {
-      mode = [ "n" "v" ];
-      key = "<leader>c";
-      action = "<Nop>";
-      options = {
-        desc = "+comment";
-      };
-    }
-
-    {
-      mode = "n";
-      key = "<leader>g";
-      action = "<Nop>";
-      options = {
-        desc = "+git";
-      };
-    }
-
-    {
-      mode = "n";
-      key = "<leader>l";
-      action = "<Nop>";
-      options = {
-        desc = "+list";
-      };
-    }
-  ];
 }