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

environment.profiles: fix order of profiles and PATH

Changed files
+6 -4
nixos
modules
+4 -1
nixos/modules/config/users-groups.nix
···
};
}) (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);
+2 -3
nixos/modules/programs/environment.nix
···
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"
];