Swap back to fugitive

This reverts commit 4c877f2.
simonrw · Apr 29, 2024 · 2f5f7ed · 2f5f7ed
1 parent 4c877f2
commit 2f5f7ed
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix
@@ -34,7 +34,6 @@ in {
     ./trouble.nix
     ./zen-mode.nix
     ./diffview.nix
-    ./neogit.nix
   ];
   config.programs.nixvim = {
     enable = true;
@@ -108,6 +107,12 @@ in {
       last-position.clear = true;
     };
     autoCmd = [
+      # support closing fugitive window with 'q'
+      {
+        event = ["FileType"];
+        pattern = ["fugitive"];
+        command = "nmap <buffer> q gq";
+      }
       # auto wrap markdown files
       {
         event = ["FileType"];
@@ -215,10 +220,30 @@ in {
         key = "<leader>A";
         action = "<cmd>Lspsaga outline<cr>";
       })
-      # neogit
+      # fugitive
+      (keymap {
+        key = "<leader>gc";
+        action = ":Git commit -v<cr>";
+      })
+      (keymap {
+        key = "<leader>gd";
+        action = ":Gvdiff<cr>";
+      })
+      (keymap {
+        key = "<leader>gw";
+        action = ":Gwrite<cr>";
+      })
+      (keymap {
+        key = "<leader>gr";
+        action = ":Gread<cr>";
+      })
       (keymap {
         key = "gs";
-        action = ":Neogit<cr>";
+        action = ":Git<cr>";
+      })
+      (keymap {
+        key = "<leader>ga";
+        action = ":Git commit -v --amend<cr>";
       })
       # vim-test
       (keymap {
@@ -253,6 +278,7 @@ in {
     plugins = {
       surround.enable = true;
       commentary.enable = true;
+      fugitive.enable = true;
       treesitter = {
         enable = true;
         disabledLanguages = [

diff --git a/home/nixvim/neogit.nix b/home/nixvim/neogit.nix