From 4553266ed24b55edeae6514553fc872963c92dc4 Mon Sep 17 00:00:00 2001
From: Dominic Egginton <dominic.egginton@gmail.com>
Date: Mon, 3 Feb 2025 12:08:37 +0000
Subject: [PATCH] fix: nix gc

---
 3                        | 16 ++++++++++++++++
 pkgs/collect-garbage.nix |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 3

diff --git a/3 b/3
new file mode 100644
index 0000000..d61a609
--- /dev/null
+++ 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
index a676865..d61a609 100644
--- 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