fix: nix gc

dominicegginton · Feb 3, 2025 · 4553266 · 4553266
1 parent 921c9d3
commit 4553266
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/3 b/3
@@ -0,0 +1,16 @@
+{ lib, writers, busybox, nix, home-manager, gum }:
+
+writers.writeBashBin "collect-garbage" ''
+  export PATH=${lib.makeBinPath [ busybox nix home-manager gum ]}
+  set -efu -o pipefail
+  nix store info
+  gum spin --show-output --title "Collecting garbage..." -- nix store gc
+  gum spin --show-output --title "Deleting old generations..." -- nix-env --delete-generations +2
+  gum spin --show-output --title "Optimising store..." -- nix store optimise
+  user=$(whoami)
+  if [ "$user" != "root" ]; then
+    gum spin --show-output --title "Collecting garbage..." -- home-manager expire-generations '-2 days'
+  else
+    gum spin --show-output --title "Deleting old generations..." -- nix-env --profile /nix/var/nix/profiles/system --delete-generations +2
+  fi
+''
diff --git a/pkgs/collect-garbage.nix b/pkgs/collect-garbage.nix
@@ -9,7 +9,7 @@ writers.writeBashBin "collect-garbage" ''
   gum spin --show-output --title "Optimising store..." -- nix store optimise
   user=$(whoami)
   if [ "$user" != "root" ]; then
-    gum spin --show-output --title "Collecting garbage..." -- home-manager expire-generations --keep '-2d'
+    gum spin --show-output --title "Collecting garbage..." -- home-manager expire-generations '-2 days'
   else
     gum spin --show-output --title "Deleting old generations..." -- nix-env --profile /nix/var/nix/profiles/system --delete-generations +2
   fi