Skip to content
Permalink
Browse files

Merge pull request #66425 from Gerschtli/fix/path-order

environment.profiles: fix order of profiles and PATH
  • Loading branch information...
matthewbauer committed Aug 13, 2019
2 parents a5b77b8 + 33c834f commit 329e097828de876410d2f82f23126115fcfc28dd
Showing with 6 additions and 4 deletions.
  1. +4 −1 nixos/modules/config/users-groups.nix
  2. +2 −3 nixos/modules/programs/environment.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);
@@ -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"
];

0 comments on commit 329e097

Please sign in to comment.
You can’t perform that action at this time.