opt in nix gc

esselius · Oct 23, 2024 · ace8576 · ace8576
1 parent f1f7234
commit ace8576
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/home-configurations/peteresselius.nix b/home-configurations/peteresselius.nix
@@ -18,6 +18,12 @@ in
       programs.fish.shellInit = ''
         set -x EMAIL (sh -c 'cat ${config.age.secrets.email.path}')
       '';
+
+      home = {
+        stateVersion = "24.05";
+        homeDirectory = if pkgs.stdenv.isDarwin then "/Users/peteresselius" else "/home/peteresselius";
+        username = "peteresselius";
+      };
     }
 
     (mkIf (config.context == "home") { })
@@ -36,10 +42,4 @@ in
       '';
     })
   ];
-
-  home = {
-    stateVersion = "24.05";
-    homeDirectory = if pkgs.stdenv.isDarwin then "/Users/peteresselius" else "/home/peteresselius";
-    username = "peteresselius";
-  };
 }
diff --git a/nixos-configurations/adama.nix b/nixos-configurations/adama.nix
@@ -14,6 +14,7 @@
     ezModules.ca
     ezModules.nginx
     ezModules.prometheus-mqtt-exporter
+    ezModules.nix-gc
   ];
 
   nixpkgs.hostPlatform = "aarch64-linux";

diff --git a/nixos-configurations/cain.nix b/nixos-configurations/cain.nix
@@ -4,6 +4,7 @@
   imports = [
     ezModules.user-peteresselius
     ezModules.sshd
+    ezModules.nix-gc
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";

diff --git a/nixos-configurations/starbuck.nix b/nixos-configurations/starbuck.nix
@@ -5,6 +5,7 @@
     ezModules.hardware-rpi5
     ezModules.sshd
     ezModules.user-peteresselius
+    ezModules.nix-gc
   ];
 
   nixpkgs.hostPlatform = "aarch64-linux";

diff --git a/nixos-modules/nix-gc.nix b/nixos-modules/nix-gc.nix
@@ -0,0 +1,9 @@
+{
+  nix = {
+    gc = {
+      automatic = true;
+      dates = "weekly";
+      options = "--delete-older-than 14d";
+    };
+  };
+}
diff --git a/nixos-modules/nix.nix b/nixos-modules/nix.nix
@@ -8,12 +8,6 @@
 
     settings.trusted-users = [ "root" "@wheel" ];
 
-    gc = {
-      automatic = true;
-      dates = "daily";
-      options = "--delete-older-than 7d";
-    };
-
     registry.nixpkgs.flake = inputs.nixpkgs;
 
     nixPath = [