diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-01-08 22:56:16 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-01-08 22:56:16 +0100 |
| commit | 45817462135e24652003232561778c4a9d8a7b87 (patch) | |
| tree | 533967558432b98c3452012845ae7d73860bbf1c /modules/programs/bash.nix | |
| parent | 4c7f6b61bcae4ae846b9e8c14f01ce89ec8825c1 (diff) | |
programs.zsh: export variables in zshenv
Diffstat (limited to 'modules/programs/bash.nix')
| -rw-r--r-- | modules/programs/bash.nix | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix index 5317a23..081e083 100644 --- a/modules/programs/bash.nix +++ b/modules/programs/bash.nix @@ -15,17 +15,6 @@ let makeWrapper ${pkgs.bash}/bin/bash $out/bin/bash ''; - - interactiveShellInit = '' - export PATH=${config.environment.systemPath}''${PATH:+:$PATH} - ${config.system.build.setEnvironment} - ${config.system.build.setAliases} - - ${config.environment.extraInit} - ${config.environment.interactiveShellInit} - ${cfg.interactiveShellInit} - ''; - in { @@ -67,7 +56,13 @@ in if [ -n "$__ETC_BASHRC_SOURCED" -o -n "$NOSYSBASHRC" ]; then return; fi __ETC_BASHRC_SOURCED=1 - ${interactiveShellInit} + export PATH=${config.environment.systemPath}''${PATH:+:$PATH} + ${config.system.build.setEnvironment} + ${config.system.build.setAliases} + + ${config.environment.extraInit} + ${config.environment.interactiveShellInit} + ${cfg.interactiveShellInit} # Read system-wide modifications. if test -f /etc/bash.local; then |