summaryrefslogtreecommitdiffstats
path: root/nixos/modules/programs
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-03-21 10:24:20 -0500
committerWill Dietz <w@wdtz.org>2019-03-21 10:28:20 -0500
commit173f79f6908e6832b8136b3015325298874d9911 (patch)
treef484b22f41754f4b7e64952bad0afba21367f2ab /nixos/modules/programs
parent9dcc876b37cafe70296d6b138638e878ad505d94 (diff)
zsh: don't export HISTFILE and friends
Just set them normally. Exporting them will propagate them to all executed programs such as bash (as used by nix-shell or nix run), and badness ensues when different formats are used.
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r--nixos/modules/programs/zsh/zsh.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index 4b995b66a267..deb94922da80 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -189,9 +189,10 @@ in
. /etc/zinputrc
- export SAVEHIST=${toString cfg.histSize}
- export HISTSIZE=${toString cfg.histSize}
- export HISTFILE=${cfg.histFile}
+ # Don't export these, otherwise other shells (bash) will try to use same histfile
+ SAVEHIST=${toString cfg.histSize}
+ HISTSIZE=${toString cfg.histSize}
+ HISTFILE=${cfg.histFile}
${optionalString (cfg.setOptions != []) "setopt ${concatStringsSep " " cfg.setOptions}"}