summary refs log tree commit diff
path: root/nixos/modules/programs
diff options
context:
space:
mode:
authorgpyh <yacine.hmito@gmail.com>2017-01-11 21:05:27 +0100
committergpyh <yacine.hmito@gmail.com>2017-01-11 22:03:27 +0100
commit373e40736a19437d0bc93ccd67dbf01b44c2cea6 (patch)
treeac82d88935ac17dcd8f919396eb489488498275f /nixos/modules/programs
parent289782b94bad45240256fbce7a3b8fee47079c24 (diff)
downloadnixpkgs-373e40736a19437d0bc93ccd67dbf01b44c2cea6.tar
nixpkgs-373e40736a19437d0bc93ccd67dbf01b44c2cea6.tar.gz
nixpkgs-373e40736a19437d0bc93ccd67dbf01b44c2cea6.tar.bz2
nixpkgs-373e40736a19437d0bc93ccd67dbf01b44c2cea6.tar.lz
nixpkgs-373e40736a19437d0bc93ccd67dbf01b44c2cea6.tar.xz
nixpkgs-373e40736a19437d0bc93ccd67dbf01b44c2cea6.tar.zst
nixpkgs-373e40736a19437d0bc93ccd67dbf01b44c2cea6.zip
Fix zshrc ordering
The content of programs.zsh.interactiveShellInit was
inserted too soon in the generated zshrc
This caused some settings related to autocompletion to be ignored
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r--nixos/modules/programs/zsh/zsh.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index b4d941a7770..990e6648e82 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -123,11 +123,6 @@ in
 
         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)
@@ -143,6 +138,12 @@ in
           "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
         }
 
+        ${zshAliases}
+        ${cfg.promptInit}
+
+        ${cfge.interactiveShellInit}
+
+
         HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
       '';