mirror of
https://github.com/LnL7/nix-darwin.git
synced 2025-03-13 20:30:02 +00:00
Merge pull request #858 from mrdomino/compinit
Add option to disable zsh global compinit
This commit is contained in:
commit
91c19ab206
1 changed files with 16 additions and 2 deletions
|
@ -1,9 +1,10 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, options, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.programs.zsh;
|
||||
opt = options.programs.zsh;
|
||||
|
||||
zshVariables =
|
||||
mapAttrsToList (n: v: ''${n}="${v}"'') cfg.variables;
|
||||
|
@ -70,6 +71,19 @@ in
|
|||
description = lib.mdDoc "Enable bash completion for all interactive zsh shells.";
|
||||
};
|
||||
|
||||
programs.zsh.enableGlobalCompInit = mkOption {
|
||||
type = types.bool;
|
||||
default = cfg.enableCompletion;
|
||||
defaultText = literalExpression "config.${opt.enableCompletion}";
|
||||
description = lib.mdDoc ''
|
||||
Enable execution of compinit call for all interactive zsh shells.
|
||||
|
||||
This option can be disabled if the user wants to extend its
|
||||
`fpath` and a custom `compinit`
|
||||
call in the local config is required.
|
||||
'';
|
||||
};
|
||||
|
||||
programs.zsh.enableFzfCompletion = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
|
@ -175,7 +189,7 @@ in
|
|||
|
||||
${cfg.promptInit}
|
||||
|
||||
${optionalString cfg.enableCompletion "autoload -U compinit && compinit"}
|
||||
${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"}
|
||||
${optionalString cfg.enableBashCompletion "autoload -U bashcompinit && bashcompinit"}
|
||||
|
||||
${optionalString cfg.enableSyntaxHighlighting
|
||||
|
|
Loading…
Add table
Reference in a new issue