config/default.nix

@@ -39,6 +39,7 @@
     # 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,36 +2,4 @@
   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,16 +14,6 @@
       };
     }
 
-    {
-      mode = ["n"];
-      key = "<leader>gS";
-      action = "<cmd>Gitsigns stage_buffer<cr>";
-      options = {
-        silent = true;
-        desc = "Stage Buffer";
-      };
-    }
-
     {
       mode = ["n" "v"];
       key = "<leader>gr";
@@ -35,7 +25,27 @@
     }
 
     {
-      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 = {
@@ -45,18 +55,18 @@
     }
 
     {
-      mode = ["n"];
-      key = "<leader>gb";
-      action = "<cmd>Gitsigns toggle_current_line_blame<cr>";
+      mode = "n";
+      key = "<leader>gp";
+      action = "<cmd>Gitsigns preview_hunk_inline<cr>";
       options = {
         silent = true;
-        desc = "Toggle Blame";
+        desc = "Preview Hunk";
       };
     }
 
     {
-      mode = ["n"];
-      key = "<leader>gB";
+      mode = "n";
+      key = "<leader>gb";
       action = "<cmd>Gitsigns blame<cr>";
       options = {
         silent = true;
@@ -65,22 +75,32 @@
     }
 
     {
-      mode = ["n"];
-      key = "[h";
-      action = "<cmd>Gitsigns prev_hunk<cr>";
+      mode = "n";
+      key = "<leader>gtb";
+      action = "<cmd>Gitsigns toggle_current_line_blame<cr>";
       options = {
         silent = true;
-        desc = "Goto Previous Hunk";
+        desc = "Toggle Blame";
       };
     }
 
     {
-      mode = ["n"];
-      key = "]h";
-      action = "<cmd>Gitsigns next_hunk<cr>";
+      mode = "n";
+      key = "<leader>gd";
+      action = "<cmd>Gitsigns diffthis<cr>";
       options = {
         silent = true;
-        desc = "Goto Next Hunk";
+        desc = "View Diff";
+      };
+    }
+
+    {
+      mode = "n";
+      key = "<leader>gtd";
+      action = "<cmd>Gitsigns toggle_deleted<cr>";
+      options = {
+        silent = true;
+        desc = "Toggle Deleted";
       };
     }
   ];

config/plugins/git/lazygit.nix

@@ -0,0 +1,31 @@
+{...}: {
+  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")
+  '';
+}