nix/8.nix-darwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

feat: add option programs.zsh.enableAutosuggestions

Browse source 
We got enableSyntaxHighlighting, so why not enableAutosuggestions too?

Ref: #527
This commit is contained in:
ed9w2in6 2025-05-01 23:31:51 +08:00
parent 4515dacafb
commit 0e83fc6e76
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/programs/zsh/default.nix
View file

@ -102,6 +102,12 @@ in
description = "Enable fzf keybinding for Ctrl-r history search."; description = "Enable fzf keybinding for Ctrl-r history search.";
}; };
programs.zsh.enableAutosuggestions = mkOption {
type = types.bool;
default = false;
description = "Enable zsh-autosuggestions.";
};
programs.zsh.enableSyntaxHighlighting = mkOption { programs.zsh.enableSyntaxHighlighting = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -123,6 +129,7 @@ in
[ # Include zsh package [ # Include zsh package
pkgs.zsh pkgs.zsh
] ++ optional cfg.enableCompletion pkgs.nix-zsh-completions ] ++ optional cfg.enableCompletion pkgs.nix-zsh-completions
++ optional cfg.enableAutosuggestions pkgs.zsh-autosuggestions
++ optional cfg.enableSyntaxHighlighting pkgs.zsh-syntax-highlighting ++ optional cfg.enableSyntaxHighlighting pkgs.zsh-syntax-highlighting
++ optional cfg.enableFastSyntaxHighlighting pkgs.zsh-fast-syntax-highlighting; ++ optional cfg.enableFastSyntaxHighlighting pkgs.zsh-fast-syntax-highlighting;
@ -199,6 +206,10 @@ in
${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"} ${optionalString cfg.enableGlobalCompInit "autoload -U compinit && compinit"}
${optionalString cfg.enableBashCompletion "autoload -U bashcompinit && bashcompinit"} ${optionalString cfg.enableBashCompletion "autoload -U bashcompinit && bashcompinit"}
${optionalString cfg.enableAutosuggestions
"source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
}
${optionalString cfg.enableSyntaxHighlighting ${optionalString cfg.enableSyntaxHighlighting
"source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
} }

3
tests/programs-zsh.nix
View file

@ -8,6 +8,7 @@
programs.zsh.enable = true; programs.zsh.enable = true;
programs.zsh.enableCompletion = true; programs.zsh.enableCompletion = true;
programs.zsh.enableBashCompletion = false; programs.zsh.enableBashCompletion = false;
programs.zsh.enableAutosuggestions = true;
programs.zsh.shellInit = "source /etc/zshenv.d/*.conf"; programs.zsh.shellInit = "source /etc/zshenv.d/*.conf";
programs.zsh.interactiveShellInit = "source /etc/zshrc.d/*.conf"; programs.zsh.interactiveShellInit = "source /etc/zshrc.d/*.conf";
@ -35,6 +36,8 @@
grep 'autoload -U compinit && compinit' ${config.out}/etc/zshrc grep 'autoload -U compinit && compinit' ${config.out}/etc/zshrc
echo >&2 "checking bashcompinit in /etc/zshrc" echo >&2 "checking bashcompinit in /etc/zshrc"
(! grep 'bashcompinit' ${config.out}/etc/zshrc) (! grep 'bashcompinit' ${config.out}/etc/zshrc)
echo >&2 "checking zsh-autosuggestions in /etc/zshrc"
grep 'source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh' ${config.out}/etc/zshrc
echo >&2 "checking zprofile.d in /etc/zprofile" echo >&2 "checking zprofile.d in /etc/zprofile"
grep 'source /etc/zprofile.d/\*.conf' ${config.out}/etc/zprofile grep 'source /etc/zprofile.d/\*.conf' ${config.out}/etc/zprofile