Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

home-environment: use per-user profile path in /etc

Browse source 
Before the profile directory value would point directly to the build
output in the Nix store. Unfortunately this would cause an infinite
loop if the user's configuration directly or indirectly refers to the
profile directory value.

Fixes #1188
This commit is contained in:
Robert Helgesson 2020-06-17 23:33:13 +02:00
parent 1a8ab9d9de
commit a49ce0e9ed
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/home-environment.nix
View file

@ -402,7 +402,7 @@ in
home.profileDirectory = home.profileDirectory =
if config.submoduleSupport.enable if config.submoduleSupport.enable
&& config.submoduleSupport.externalPackageInstall && config.submoduleSupport.externalPackageInstall
then config.home.path then "/etc/profiles/per-user/${cfg.username}"
else cfg.homeDirectory + "/.nix-profile"; else cfg.homeDirectory + "/.nix-profile";
home.sessionVariables = home.sessionVariables =

2
nix-darwin/default.nix
View file

@ -72,6 +72,8 @@ in
}) cfg.users }) cfg.users
); );
environment.pathsToLink = mkIf cfg.useUserPackages [ "/etc/profile.d" ];
system.activationScripts.postActivation.text = system.activationScripts.postActivation.text =
concatStringsSep "\n" (mapAttrsToList (username: usercfg: '' concatStringsSep "\n" (mapAttrsToList (username: usercfg: ''
echo Activating home-manager configuration for ${username} echo Activating home-manager configuration for ${username}

2
nixos/default.nix
View file

@ -88,6 +88,8 @@ in {
(mapAttrs (username: usercfg: { packages = [ usercfg.home.path ]; }) (mapAttrs (username: usercfg: { packages = [ usercfg.home.path ]; })
cfg.users); cfg.users);
environment.pathsToLink = mkIf cfg.useUserPackages [ "/etc/profile.d" ];
systemd.services = mapAttrs' (_: usercfg: systemd.services = mapAttrs' (_: usercfg:
let username = usercfg.home.username; let username = usercfg.home.username;
in nameValuePair ("home-manager-${utils.escapeSystemdPath username}") { in nameValuePair ("home-manager-${utils.escapeSystemdPath username}") {