From a5ba014019246b70dedcf6e3467af1bcc1fd5759 Mon Sep 17 00:00:00 2001 From: Andre Date: Sat, 22 Jun 2024 13:39:54 -0400 Subject: [PATCH] refactor(system): simplify Nix config file --- system/modules/system/nix.nix | 47 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/system/modules/system/nix.nix b/system/modules/system/nix.nix index 6946fae..b1c7f18 100644 --- a/system/modules/system/nix.nix +++ b/system/modules/system/nix.nix @@ -19,33 +19,32 @@ in default = "30d"; }; }; - config = lib.mkMerge [ - (lib.mkIf cfg.allowUnfree { nixpkgs.config.allowUnfree = true; }) - ({ - nix = { - # Enable Flakes - settings.experimental-features = [ - "nix-command" - "flakes" - ]; + config = { + nixpkgs.config.allowUnfree = cfg.allowUnfree; - # Enable periodic nix store optimization - optimise.automatic = true; + nix = { + # Enable Flakes + settings.experimental-features = [ + "nix-command" + "flakes" + ]; - # Enable weekly garbage collection. Delete generations that are older than two weeks. - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than ${cfg.retentionPeriod}"; - }; + # Enable periodic nix store optimization + optimise.automatic = true; - # Configure NixOS to use the same software channel as Flakes - registry = lib.mapAttrs (_: value: { flake = value; }) inputs; - nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + # Enable weekly garbage collection. Delete generations that are older than two weeks. + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than ${cfg.retentionPeriod}"; }; - # Support for standard, dynamically-linked executables - programs.nix-ld.enable = true; - }) - ]; + # Configure NixOS to use the same software channel as Flakes + registry = lib.mapAttrs (_: value: { flake = value; }) inputs; + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + }; + + # Support for standard, dynamically-linked executables + programs.nix-ld.enable = true; + }; }