Merge pull request #21 from datsfilipe/feat-replace-trash-cli

feat: replace trash cli with custom script
datsfilipe · Jan 9, 2025 · 58fa89e · 58fa89e
2 parents 77fd587 + c12fb5d
commit 58fa89e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home/base/core/shells/shellAliases.nix b/home/base/core/shells/shellAliases.nix
@@ -3,11 +3,12 @@
   "lla"="eza --color always --icons -1galb -s name --git --sort date --group-directories-first";
   "tree"="eza --tree -D -L 3";
 
-  "del"="trash-put";
-  "dels"="trash-list";
-  "delu"="trash-restore";
-  "delc"="trash-empty";
-  "delr"="trash-rm";
+  "del"="trash";
+  "dels"="trash --list";
+  "delu"="trash --fzf";
+  "delr"="trash --restore";
+  "delc"="trash --cleanup";
+  "delca"="trash --cleanup-all";
 
   "g"="git";
   "ga"="git add";

diff --git a/home/linux/base/scripts/conf b/home/linux/base/scripts/conf
diff --git a/modules/nixos/desktop/gc.nix b/modules/nixos/desktop/gc.nix
@@ -6,6 +6,7 @@ let
 in {
   systemd.services.path-garbage-collector = {
     description = "Clean up old files from specified paths";
+    path = [ pkgs.findutils pkgs.coreutils ];
     serviceConfig = {
       Type = "oneshot";
       ExecStart = pkgs.writeShellScript "cleanup-paths" ''
@@ -14,6 +15,8 @@ in {
             find "$path" -type f -mtime +"''${age%d}" -delete 2>/dev/null
           fi
         done < ${configFile}
+
+        find / -type d \( -name ".trash" -o -name ".Trash" -o -name ".Trash-1000" \) -exec $(which rm) -rf {} + 2>/dev/null || true
       '';
     };
   };