diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-08-13 15:06:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 15:06:09 -0400 |
| commit | 329e097828de876410d2f82f23126115fcfc28dd (patch) | |
| tree | 74bbe3b9aeb2f8905ceaf3d701ae04f3cb1e7e31 | |
| parent | a5b77b8cae4d47c53de0fdac8ace8775c09cd7bb (diff) | |
| parent | 33c834f2fb2c25f2351cd0ae9b8cc361e033141b (diff) | |
Merge pull request #66425 from Gerschtli/fix/path-order
environment.profiles: fix order of profiles and PATH
| -rw-r--r-- | nixos/modules/config/users-groups.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/programs/environment.nix | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index c3f228c9bcc4..25f1c67ce830 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -564,7 +564,10 @@ in { }; }) (filterAttrs (_: u: u.packages != []) cfg.users)); - environment.profiles = [ "/etc/profiles/per-user/$USER" ]; + environment.profiles = [ + "$HOME/.nix-profile" + "/etc/profiles/per-user/$USER" + ]; assertions = [ { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique); diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 3c6d356ef998..4d762314298d 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -23,9 +23,8 @@ in XCURSOR_PATH = [ "$HOME/.icons" ]; }; - environment.profiles = - [ "$HOME/.nix-profile" - "/nix/var/nix/profiles/default" + environment.profiles = mkAfter + [ "/nix/var/nix/profiles/default" "/run/current-system/sw" ]; |