Skip to content

Commit

Permalink
Merge pull request #858 from mrdomino/compinit
Browse files Browse the repository at this point in the history
Add option to disable zsh global compinit
  • Loading branch information
Enzime authored Jan 21, 2024
2 parents 3ac7acd + a3be68d commit 91c19ab
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions modules/programs/zsh/default.nix
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 91c19ab

Please sign in to comment.