diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-07-01 21:14:14 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-07-01 21:24:29 +0200 |
| commit | 8c2b25e60dfd60dc4ca1a0220e5c00f7af4132c4 (patch) | |
| tree | 93d8c9575b658adbe3abccf2d8f74e656cd96ec8 /modules | |
| parent | 2415dd6e42be9f8d6e1eaa075b14810c27bf907f (diff) | |
nix: fix useDaemon conditions
The nix.useDaemon option enables using a multi-user install without
managing the nix installation with nix-darwin. The following checks
apply to both cases.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/nix/default.nix | 2 | ||||
| -rw-r--r-- | modules/services/nix-gc/default.nix | 2 | ||||
| -rw-r--r-- | modules/system/checks.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/nix/default.nix b/modules/nix/default.nix index b4fdff4..ad1540b 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -22,7 +22,7 @@ let # WARNING: this file is generated from the nix.* options in # your NixOS configuration, typically # /etc/nixos/configuration.nix. Do not edit it! - ${optionalString config.services.nix-daemon.enable '' + ${optionalString cfg.useDaemon '' build-users-group = nixbld ''} ${if isNix20 then "max-jobs" else "build-max-jobs"} = ${toString (cfg.maxJobs)} diff --git a/modules/services/nix-gc/default.nix b/modules/services/nix-gc/default.nix index ca4a0ab..57b3e22 100644 --- a/modules/services/nix-gc/default.nix +++ b/modules/services/nix-gc/default.nix @@ -41,7 +41,7 @@ in launchd.daemons.nix-gc = { command = "${config.nix.package}/bin/nix-collect-garbage ${cfg.options}"; - environment.NIX_REMOTE = optionalString config.services.nix-daemon.enable "daemon"; + environment.NIX_REMOTE = optionalString config.nix.useDaemon "daemon"; serviceConfig.RunAtLoad = false; serviceConfig.StartCalendarInterval = [ cfg.interval ]; serviceConfig.UserName = cfg.user; diff --git a/modules/system/checks.nix b/modules/system/checks.nix index f22b1e7..0ff0893 100644 --- a/modules/system/checks.nix +++ b/modules/system/checks.nix @@ -169,7 +169,7 @@ in system.checks.text = mkMerge [ darwinChanges runLink - (mkIf config.services.nix-daemon.enable buildUsers) + (mkIf config.nix.useDaemon buildUsers) nixStore (mkIf (config.nix.gc.automatic && config.nix.gc.user == null) nixGarbageCollector) nixChannels |