add trashy and neogit

home-manager/nixvim/config.nix

@@ -78,10 +78,20 @@
       action = "<CMD>Gitsigns toggle_deleted";
       options.desc = "Gitsigns deleted";
     }
+    {
+      key = "<leader>gc";
+      action = "<CMD>NvimTreeClose<CR><CMD>Neogit<CR>";
+      options.desc = "Commit changes";
+    }
     {
       key = "<leader>gd";
-      action = "<CMD>Gitsigns diffthis<CR>";
-      options.desc = "Gitsigns diff this buffer";
+      action = "<CMD>NvimTreeClose<CR><CMD>DiffviewOpen<CR>";
+      options.desc = "View git changes";
+    }
+    {
+      key = "<leader>gq";
+      action = "<CMD>DiffviewClose<CR><CMD>NvimTreeOpen<CR>";
+      options.desc = "Close git changes";
     }
     {
       mode = "n";

home-manager/nixvim/git.nix

@@ -1,4 +1,13 @@
 {
+  plugins.diffview = {
+    enable = true;
+  };
+  plugins.neogit = {
+    enable = true;
+    integrations = {
+      diffview = true;
+    };
+  };
   plugins.gitsigns = {
     enable = true;
     settings = {

home-manager/zsh.nix

@@ -18,6 +18,7 @@
           updateOffline = "sudo nixos-rebuild switch --option substitute false";
           goto = "cd $(find ~/projects -maxdepth 2 -type d | ${pkgs.fzf}/bin/fzf)";
           dev= "nix-shell --run zsh";
+          rm= "trashy put";
       };
       oh-my-zsh = {
         enable = true;