From 0a54694b576a811092f13432869ef5b8eb6d6348 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Thu, 22 Dec 2022 22:59:26 +0100 Subject: [PATCH] Removed garbage collection --- modules/homepage/default.nix | 1 - modules/mailserver/default.nix | 1 - modules/nix/default.nix | 12 ------------ modules/secrets/default.nix | 1 - 4 files changed, 15 deletions(-) diff --git a/modules/homepage/default.nix b/modules/homepage/default.nix index 2f6d1e6..8b0c1e6 100644 --- a/modules/homepage/default.nix +++ b/modules/homepage/default.nix @@ -23,7 +23,6 @@ in root = inputs.homepage; }; - nix.gcRoots = [ inputs.homepage ]; }; } diff --git a/modules/mailserver/default.nix b/modules/mailserver/default.nix index 291663d..adcf14d 100644 --- a/modules/mailserver/default.nix +++ b/modules/mailserver/default.nix @@ -45,6 +45,5 @@ with lib; sops.secrets.ensmailmalka-pw = { }; sops.secrets.ensmailmondon-pw = { }; - nix.gcRoots = [ inputs.simple-nixos-mailserver ]; }; } diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 1b5e8cb..271a777 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -8,21 +8,11 @@ with lib; enable = mkEnableOption "Enable nix experimental"; }; - options.nix.gcRoots = mkOption { - description = "A list of garbage collector roots."; - type = with types; listOf path; - default = []; - }; - config = mkIf cfg.enable { nixpkgs.config.allowUnfree = true; nix = { autoOptimiseStore = true; - gc = { - automatic = true; - dates = "weekly"; - }; package = pkgs.unstable.nix; extraOptions = '' experimental-features = nix-command flakes @@ -39,9 +29,7 @@ with lib; "bin.julienmalka.me:RfXA+kPZt3SsMHGib5fY5mxJQLijfXzPbHjHD52ijyI=" ]; - gcRoots = [ inputs.neovim-nightly-overlay inputs.nixpkgs inputs.unstable inputs.home-manager ]; }; - environment.etc.gc-roots.text = concatMapStrings (x: x + "\n") config.nix.gcRoots; }; } diff --git a/modules/secrets/default.nix b/modules/secrets/default.nix index e03dce3..0c46ae1 100644 --- a/modules/secrets/default.nix +++ b/modules/secrets/default.nix @@ -24,7 +24,6 @@ with lib; format = "binary"; }; - nix.gcRoots = [ inputs.sops-nix ]; };