JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #40223 from jD91mZM2/shouldnt-we-just-use-the-pam-environment-file-instead

Browse Source 
zsh: move setEnvironment stuff to zprofile
This commit is contained in:
Matthew Justin Bauer 2018-05-16 00:52:31 -05:00 committed by GitHub
commit 485fe9e766
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/programs/zsh/zsh.nix
View File

@ -108,8 +108,6 @@ in
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1 export __ETC_ZSHENV_SOURCED=1
${config.system.build.setEnvironment.text}
${cfge.shellInit} ${cfge.shellInit}
${cfg.shellInit} ${cfg.shellInit}
@ -129,6 +127,8 @@ in
if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
__ETC_ZPROFILE_SOURCED=1 __ETC_ZPROFILE_SOURCED=1
${config.system.build.setEnvironment.text}
${cfge.loginShellInit} ${cfge.loginShellInit}
${cfg.loginShellInit} ${cfg.loginShellInit}