Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Address review comments

Browse source 
(cherry picked from commit 16946a6f00)
This commit is contained in:
Olli Helenius 2018-12-23 12:53:01 +02:00 committed by Robert Helgesson
parent 8026e4ff6f
commit af94896ba1
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/programs/zsh.nix
View file

@ -193,10 +193,10 @@ in
}; };
defaultKeymap = mkOption { defaultKeymap = mkOption {
type = types.nullOr (types.enum [ "emacs" "viins" "vicmd" ]); type = types.nullOr (types.enum (attrNames bindkeyCommands));
default = null; default = null;
example = "emacs"; example = "emacs";
description = "The default base keymap to use"; description = "The default base keymap to use.";
}; };
sessionVariables = mkOption { sessionVariables = mkOption {
@ -316,8 +316,10 @@ in
HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
${if cfg.defaultKeymap != null && hasAttr cfg.defaultKeymap bindkeyCommands ${optionalString (cfg.defaultKeymap != null) ''
then getAttr cfg.defaultKeymap bindkeyCommands else ""} # Use ${cfg.defaultKeymap} keymap as the default.
${getAttr cfg.defaultKeymap bindkeyCommands}
''}
${concatStrings (map (plugin: '' ${concatStrings (map (plugin: ''
path+="$HOME/${pluginsDir}/${plugin.name}" path+="$HOME/${pluginsDir}/${plugin.name}"