From 9910bfeeb7fd1841cdc87d3878e704d487245c56 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Sat, 8 Jun 2024 17:09:02 +0200
Subject: [PATCH] add trashy and neogit

---
 home-manager/nixvim/config.nix | 14 ++++++++++++--
 home-manager/nixvim/git.nix    |  9 +++++++++
 home-manager/zsh.nix           |  1 +
 modules/misc/cli-tools.nix     |  1 +
 overlays.nix                   | 23 +++++++++++++++++++----
 5 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/home-manager/nixvim/config.nix b/home-manager/nixvim/config.nix
index 098fdfa..945eadf 100644
--- a/home-manager/nixvim/config.nix
+++ b/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";
diff --git a/home-manager/nixvim/git.nix b/home-manager/nixvim/git.nix
index e5cbbb7..d97f432 100644
--- a/home-manager/nixvim/git.nix
+++ b/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 = {
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
index 585ebb0..cc0fe97 100644
--- a/home-manager/zsh.nix
+++ b/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;
diff --git a/modules/misc/cli-tools.nix b/modules/misc/cli-tools.nix
index 9b056d6..09a8b6c 100644
--- a/modules/misc/cli-tools.nix
+++ b/modules/misc/cli-tools.nix
@@ -44,6 +44,7 @@ in
       nix-output-monitor # nom
       nvd # nix diff, example: nvd diff /nix/var/nix/profiles/system-389-link /nix/var/nix/profiles/system-390-link
       compsize
+      trashy # move files to trash
     ];
   };
 }
diff --git a/overlays.nix b/overlays.nix
index 985f40b..37eab40 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -1,7 +1,7 @@
 # This file defines overlays
-{inputs, ...}: {
+{ inputs, ... }: {
   # This one brings our custom packages from the 'pkgs' directory
-  additions = final: _prev: import ./pkgs {pkgs = final;};
+  additions = final: _prev: import ./pkgs { pkgs = final; };
 
   # This one contains whatever you want to overlay
   # You can change versions, add patches, set compilation flags, anything really.
@@ -9,8 +9,23 @@
   modifications = final: prev: {
     discord = prev.discord.override { withVencord = true; };
     tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; };
-    nerdfonts = prev.nerdfonts.override { fonts = ["Hack" "Noto"]; };
-    waybar = prev.waybar.overrideAttrs (oldAttrs: { mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; });
+    nerdfonts = prev.nerdfonts.override { fonts = [ "Hack" "Noto" ]; };
+    waybar = prev.waybar.overrideAttrs (oldAttrs: {
+      mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+    });
+    trashy = prev.trashy.overrideAttrs rec {
+      version = "unstable-2.0.0";
+      src = prev.fetchFromGitHub {
+        owner = "oberblastmeister";
+        repo = "trashy";
+        rev = "7c48827e55bca5a3188d3de44afda3028837b34b";
+        sha256 = "1pxmeXUkgAITouO0mdW6DgZR6+ai2dax2S4hV9jcJLM=";
+      };
+      cargoDeps = prev.rustPlatform.fetchCargoTarball {
+        inherit src;
+        hash = "sha256-/q/ZCpKkwhnPh3MMVNYZw6XvjyQpoZDBXCPagliGr1M=";
+      };
+    };
     # example = prev.example.overrideAttrs (oldAttrs: rec {
     # ...
     # });