diff options
| author | Malo Bourgon <mbourgon@gmail.com> | 2022-08-13 15:43:54 -0700 |
|---|---|---|
| committer | Malo Bourgon <mbourgon@gmail.com> | 2022-08-16 10:41:51 -0700 |
| commit | d44b8be38ce5e021bf3a280fa63087b4d79c26ee (patch) | |
| tree | 180ee8feaa1e6c83b06f862fadac0674922034d0 /modules | |
| parent | 5786c079f8c095a77d6c8fb72d06a093bfdfa9d3 (diff) | |
Reorder `nix` module implementation to better match order of NixOS module
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/nix/default.nix | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 62bf941..db1d40f 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -512,25 +512,12 @@ in ###### implementation config = { - + # Not in NixOS module warnings = [ (mkIf (!config.services.activate-system.enable && cfg.distributedBuilds) "services.activate-system is not enabled, a reboot could cause distributed builds to stop working.") (mkIf (!cfg.distributedBuilds && cfg.buildMachines != []) "nix.distributedBuilds is not enabled, build machines won't be configured.") ]; - nix.nixPath = mkMerge [ - (mkIf (config.system.stateVersion < 2) (mkDefault - [ "darwin=$HOME/.nix-defexpr/darwin" - "darwin-config=$HOME/.nixpkgs/darwin-configuration.nix" - "/nix/var/nix/profiles/per-user/root/channels" - ])) - (mkIf (config.system.stateVersion > 3) (mkOrder 1200 - [ { darwin-config = "${config.environment.darwinConfig}"; } - "/nix/var/nix/profiles/per-user/root/channels" - "$HOME/.nix-defexpr/channels" - ])) - ]; - environment.systemPackages = [ nixPackage @@ -570,6 +557,24 @@ in ) cfg.buildMachines; }; + # Not in NixOS module + nix.nixPath = mkMerge [ + (mkIf (config.system.stateVersion < 2) (mkDefault + [ "darwin=$HOME/.nix-defexpr/darwin" + "darwin-config=$HOME/.nixpkgs/darwin-configuration.nix" + "/nix/var/nix/profiles/per-user/root/channels" + ])) + (mkIf (config.system.stateVersion > 3) (mkOrder 1200 + [ { darwin-config = "${config.environment.darwinConfig}"; } + "/nix/var/nix/profiles/per-user/root/channels" + "$HOME/.nix-defexpr/channels" + ])) + ]; + + # Set up the environment variables for running Nix. + environment.variables = cfg.envVars // { NIX_PATH = concatStringsSep ":" cfg.nixPath; }; + + # Unreladed to use in NixOS module environment.extraInit = '' # Set up secure multi-user builds: non-root users build through the # Nix daemon. @@ -578,11 +583,7 @@ in fi ''; - # Set up the environment variables for running Nix. - environment.variables = cfg.envVars // - { NIX_PATH = concatStringsSep ":" cfg.nixPath; - }; - + # Unreladed to use in NixOS module system.activationScripts.nix-daemon.text = mkIf cfg.useDaemon '' if ! diff /etc/nix/nix.conf /run/current-system/etc/nix/nix.conf &> /dev/null; then echo "reloading nix-daemon..." >&2 |