update keybindings for fugitive and gitsigns

config/default.nix

@@ -39,7 +39,6 @@
     # Git
     ./plugins/git/fugitive.nix
     ./plugins/git/gitsigns.nix
-    ./plugins/git/lazygit.nix
 
     # Utils
     ./plugins/utils/copilot-chat.nix

config/plugins/git/fugitive.nix

@@ -2,4 +2,36 @@
   plugins.fugitive = {
     enable = true;
   };
+
+  keymaps = [
+    {
+      mode = ["n"];
+      key = "<leader>gc";
+      action = "<cmd>Git commit<cr>";
+      options = {
+        silent = true;
+        desc = "Commit Changes";
+      };
+    }
+
+    {
+      mode = ["n"];
+      key = "<leader>gd";
+      action = "<cmd>Git diff<cr>";
+      options = {
+        silent = true;
+        desc = "View diff";
+      };
+    }
+
+    {
+      mode = ["n"];
+      key = "<leader>gu";
+      action = "<cmd>Git restore --staged .<cr>";
+      options = {
+        silent = true;
+        desc = "Unstage all changes";
+      };
+    }
+  ];
 }

config/plugins/git/gitsigns.nix

@@ -14,6 +14,16 @@
       };
     }
 
+    {
+      mode = ["n"];
+      key = "<leader>gS";
+      action = "<cmd>Gitsigns stage_buffer<cr>";
+      options = {
+        silent = true;
+        desc = "Stage Buffer";
+      };
+    }
+
     {
       mode = ["n" "v"];
       key = "<leader>gr";
@@ -25,27 +35,7 @@
     }
 
     {
-      mode = "n";
+      mode = ["n"];
-      key = "<leader>gS";
-      action = "<cmd>Gitsigns stage_buffer<cr>";
-      options = {
-        silent = true;
-        desc = "Stage Buffer";
-      };
-    }
-
-    {
-      mode = "n";
-      key = "<leader>gu";
-      action = "<cmd>Gitsigns undo_stage_hunk<cr>";
-      options = {
-        silent = true;
-        desc = "Undo Staged Hunk";
-      };
-    }
-
-    {
-      mode = "n";
       key = "<leader>gR";
       action = "<cmd>Gitsigns reset_buffer<cr>";
       options = {
@@ -55,28 +45,8 @@
     }
 
     {
-      mode = "n";
+      mode = ["n"];
-      key = "<leader>gp";
-      action = "<cmd>Gitsigns preview_hunk_inline<cr>";
-      options = {
-        silent = true;
-        desc = "Preview Hunk";
-      };
-    }
-
-    {
-      mode = "n";
       key = "<leader>gb";
-      action = "<cmd>Gitsigns blame<cr>";
-      options = {
-        silent = true;
-        desc = "View Blame";
-      };
-    }
-
-    {
-      mode = "n";
-      key = "<leader>gtb";
       action = "<cmd>Gitsigns toggle_current_line_blame<cr>";
       options = {
         silent = true;
@@ -85,22 +55,32 @@
     }
 
     {
-      mode = "n";
+      mode = ["n"];
-      key = "<leader>gd";
+      key = "<leader>gB";
-      action = "<cmd>Gitsigns diffthis<cr>";
+      action = "<cmd>Gitsigns blame<cr>";
       options = {
         silent = true;
-        desc = "View Diff";
+        desc = "View Blame";
       };
     }
 
     {
-      mode = "n";
+      mode = ["n"];
-      key = "<leader>gtd";
+      key = "[h";
-      action = "<cmd>Gitsigns toggle_deleted<cr>";
+      action = "<cmd>Gitsigns prev_hunk<cr>";
       options = {
         silent = true;
-        desc = "Toggle Deleted";
+        desc = "Goto Previous Hunk";
+      };
+    }
+
+    {
+      mode = ["n"];
+      key = "]h";
+      action = "<cmd>Gitsigns next_hunk<cr>";
+      options = {
+        silent = true;
+        desc = "Goto Next Hunk";
       };
     }
   ];

config/plugins/git/lazygit.nix

@@ -1,31 +0,0 @@
-{...}: {
-  plugins.lazygit = {
-    enable = true;
-  };
-
-  keymaps = [
-    {
-      mode = "n";
-      key = "<leader>gL";
-      action = "<cmd>LazyGit<cr>";
-      options = {
-        desc = "Open LazyGit";
-      };
-    }
-
-    {
-      mode = "n";
-      key = "<leader>glr";
-      action = {
-        __raw = "require('telescope').extensions.lazygit.lazygit";
-      };
-      options = {
-        desc = "List repositories";
-      };
-    }
-  ];
-
-  extraConfigLua = ''
-    require("telescope").load_extension("lazygit")
-  '';
-}