diff options
| author | Alice Carroll <git@alice-carroll.pet> | 2024-08-03 19:32:20 +0300 |
|---|---|---|
| committer | Alice Carroll <git@alice-carroll.pet> | 2024-08-17 02:51:01 +0300 |
| commit | 5afa71b4131a97d72804a97a34bd4a916ea5e990 (patch) | |
| tree | 60c730eb0c8f04aef6f9e35747fbef564557cef6 /modules/nix | |
| parent | 691a590bff479964d4fe48c4244d3d4486d854fb (diff) | |
fix: respect user nixPath configuration
Diffstat (limited to 'modules/nix')
| -rw-r--r-- | modules/nix/default.nix | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 09c8970..14668a2 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -768,17 +768,11 @@ in ]; # 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" - ])) - ]; + nix.nixPath = 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" + ]); # Set up the environment variables for running Nix. environment.variables = cfg.envVars // { NIX_PATH = cfg.nixPath; }; |