diff --git a/flake.nix b/flake.nix index 91851f0..5d96229 100644 --- a/flake.nix +++ b/flake.nix @@ -56,6 +56,7 @@ odinBaseModules = [ { nixpkgs = nixpkgsSettings; } + ./nixos_modules/automatic-garbage-collection.nix ./odin/hardware-configuration.nix nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-pc-laptop @@ -65,6 +66,7 @@ thorBaseModules = [ { nixpkgs = nixpkgsSettings; } + ./nixos_modules/automatic-garbage-collection.nix ./thor/hardware-configuration.nix nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-pc-ssd @@ -73,6 +75,7 @@ lokiBaseModules = [ { nixpkgs = nixpkgsSettings; } + ./nixos_modules/automatic-garbage-collection.nix ./loki/hardware-configuration.nix nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-pc-ssd diff --git a/loki/configuration.nix b/loki/configuration.nix index a4dad2a..c7974a1 100644 --- a/loki/configuration.nix +++ b/loki/configuration.nix @@ -337,7 +337,6 @@ with lib; package = pkgs.nixFlakes; extraOptions = optionalString (config.nix.package == pkgs.nixFlakes) "experimental-features = nix-command flakes"; - gc.automatic = true; }; system.autoUpgrade = { diff --git a/nixos_modules/automatic-garbage-collection.nix b/nixos_modules/automatic-garbage-collection.nix new file mode 100644 index 0000000..d8a7719 --- /dev/null +++ b/nixos_modules/automatic-garbage-collection.nix @@ -0,0 +1,3 @@ +{ + nix.gc = { automatic = true; options = "--delete-older-than 7d"; }; +} diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix index ed26a4e..4ccfe00 100644 --- a/odin/common_configuration.nix +++ b/odin/common_configuration.nix @@ -236,10 +236,6 @@ with lib; package = pkgs.nixFlakes; extraOptions = lib.optionalString (config.nix.package == pkgs.nixFlakes) "experimental-features = nix-command flakes"; - gc = { - automatic = true; - options = "--delete-older-than 7d"; - }; }; # This value determines the NixOS release from which the default diff --git a/thor/configuration.nix b/thor/configuration.nix index a1138d1..9fa341f 100644 --- a/thor/configuration.nix +++ b/thor/configuration.nix @@ -173,7 +173,6 @@ with lib; nix = { package = pkgs.nixFlakes; extraOptions = "experimental-features = nix-command flakes"; - gc.automatic = true; }; system.stateVersion = "21.05"; # Did you read the comment?