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

Remove deprecated option home.sessionVariableSetter

Browse source
This commit is contained in:
Robert Helgesson 2018-02-08 22:54:29 +01:00
parent 1bc59f7290
commit 9ea353569a
No known key found for this signature in database
GPG key ID: C3DB11069E65DC86
8 changed files with 17 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/programs/bash.nix
View file

@ -183,9 +183,7 @@ in
home.file.".profile".text = ''
# -*- mode: sh -*-
${optionalString (config.home.sessionVariableSetter != "pam") ''
. "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
''}
. "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
${sessionVarsStr}

7
modules/programs/info.nix
View file

@ -54,13 +54,6 @@ in
};
config = mkIf cfg.enable {
assertions = [{
assertion = config.home.sessionVariableSetter != "pam";
message = ''
The info module does not work with PAM as a session variable setter.
'';
}];
home.sessionVariables.INFOPATH =
"${cfg.homeInfoDirLocation}\${INFOPATH:+:}\${INFOPATH}";

4
modules/programs/zsh.nix
View file

@ -332,9 +332,7 @@ in
${cfg.initExtra}
# Environment variables
${optionalString (config.home.sessionVariableSetter != "pam") ''
. "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
''}
. "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
${envVarsStr}
# Aliases