alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/zsh: move zsh setopt

Browse source
This commit is contained in:
Izorkin 2019-06-08 20:36:24 +03:00 committed by Maximilian Bosch
parent 70de27bbb4
commit 82ad143a51
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/doc/manual/release-notes/rl-1909.xml
View file

@ -131,6 +131,12 @@
and <option>services.limesurvey.virtualHost</option> options. and <option>services.limesurvey.virtualHost</option> options.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The setopt declarations will be evaluated at the end of <literal>/etc/zshrc</literal>, so any code in <xref linkend="opt-programs.zsh.interactiveShellInit" />,
<xref linkend="opt-programs.zsh.loginShellInit" /> and <xref linkend="opt-programs.zsh.promptInit" /> may break if it relies on those options being set.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

4
nixos/modules/programs/zsh/zsh.nix
View file

@ -194,8 +194,6 @@ in
HISTSIZE=${toString cfg.histSize} HISTSIZE=${toString cfg.histSize}
HISTFILE=${cfg.histFile} HISTFILE=${cfg.histFile}
${optionalString (cfg.setOptions != []) "setopt ${concatStringsSep " " cfg.setOptions}"}
HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
# Tell zsh how to find installed completions # Tell zsh how to find installed completions
@ -209,6 +207,8 @@ in
${cfg.interactiveShellInit} ${cfg.interactiveShellInit}
${optionalString (cfg.setOptions != []) "setopt ${concatStringsSep " " cfg.setOptions}"}
${zshAliases} ${zshAliases}
${cfg.promptInit} ${cfg.promptInit}