summary refs log tree commit diff
path: root/nixos/modules/programs
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2016-01-16 17:25:20 +0100
committerFranz Pletz <fpletz@fnordicwalking.de>2016-01-16 17:25:20 +0100
commitcac1041ced351b5e49f71f4f7a10834d212caed5 (patch)
tree93afe0a8f8b617dde477e2e06b42d3f7e8e21762 /nixos/modules/programs
parent1d02daf9b000278d5907949e3e79888c30a131b2 (diff)
parented83b8a61ce2ee61d82f58f068045fafd24cb2fc (diff)
downloadnixlib-cac1041ced351b5e49f71f4f7a10834d212caed5.tar
nixlib-cac1041ced351b5e49f71f4f7a10834d212caed5.tar.gz
nixlib-cac1041ced351b5e49f71f4f7a10834d212caed5.tar.bz2
nixlib-cac1041ced351b5e49f71f4f7a10834d212caed5.tar.lz
nixlib-cac1041ced351b5e49f71f4f7a10834d212caed5.tar.xz
nixlib-cac1041ced351b5e49f71f4f7a10834d212caed5.tar.zst
nixlib-cac1041ced351b5e49f71f4f7a10834d212caed5.zip
Merge pull request #12328 from makefu/zsh-allow-override-history-defaults
programs.zsh: allow override of history defaults
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r--nixos/modules/programs/zsh/zsh.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index dae7e446b4cf..b51104c16fa9 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -98,18 +98,18 @@ in
       loginShellInit = cfge.loginShellInit;
 
       interactiveShellInit = ''
-        ${cfge.interactiveShellInit}
-
-        ${cfg.promptInit}
-        ${zshAliases}
-
-        # Some sane history defaults
+        # history defaults
         export SAVEHIST=2000
         export HISTSIZE=2000
         export HISTFILE=$HOME/.zsh_history
 
         setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK
 
+        ${cfge.interactiveShellInit}
+
+        ${cfg.promptInit}
+        ${zshAliases}
+
         # Tell zsh how to find installed completions
         for p in ''${(z)NIX_PROFILES}; do
           fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions)