diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-05-15 19:22:44 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-05-15 19:46:34 +0200 |
| commit | 1b6f56f5b8042000a826ecba2ebe52a831e2df46 (patch) | |
| tree | 4dda5f9485d38401c588c9e374a0bae25f3e15a1 /modules/programs | |
| parent | c8ce901a43747eb79a986d90e016e5145dd0e616 (diff) | |
environment: include /usr/sbin and /sbin in systemPath
Don't extend initial PATH adding extra entries should be done through
appending environment.systemPath or manually extending it with
environment.extraInit or similar options.
Diffstat (limited to 'modules/programs')
| -rw-r--r-- | modules/programs/bash.nix | 2 | ||||
| -rw-r--r-- | modules/programs/fish.nix | 2 | ||||
| -rw-r--r-- | modules/programs/zsh/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix index abd2875..da79742 100644 --- a/modules/programs/bash.nix +++ b/modules/programs/bash.nix @@ -63,7 +63,7 @@ in if [ -n "$__ETC_BASHRC_SOURCED" -o -n "$NOSYSBASHRC" ]; then return; fi __ETC_BASHRC_SOURCED=1 - export PATH=${config.environment.systemPath}''${PATH:+:$PATH} + export PATH=${config.environment.systemPath} ${config.system.build.setEnvironment} ${config.system.build.setAliases} diff --git a/modules/programs/fish.nix b/modules/programs/fish.nix index ba0f67d..62cfd8b 100644 --- a/modules/programs/fish.nix +++ b/modules/programs/fish.nix @@ -123,7 +123,7 @@ in set fish_function_path $fish_function_path ${pkgs.fish-foreign-env}/share/fish-foreign-env/functions - set PATH ${replaceStrings [":"] [" "] config.environment.systemPath} $PATH + set PATH ${replaceStrings [":"] [" "] config.environment.systemPath} ${config.system.build.setEnvironment} diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix index 8eec449..f330a5c 100644 --- a/modules/programs/zsh/default.nix +++ b/modules/programs/zsh/default.nix @@ -177,7 +177,7 @@ in setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK - export PATH=${config.environment.systemPath}''${PATH:+:$PATH} + export PATH=${config.environment.systemPath} ${config.system.build.setEnvironment} ${config.system.build.setAliases} |