mirrors/home-manager
mirrors/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-03-29 03:04:34 +00:00
Code Activity

zsh: move option variables closer to usage

Browse source
This commit is contained in:
Austin Horstman 2025-03-13 09:35:23 -05:00
parent ad487d3863
commit 1b0efe3d33
1 changed files with 263 additions and 262 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/programs/zsh.nix
View file

@ -6,14 +6,23 @@ let
relToDotDir = file: (optionalString (cfg.dotDir != null) (cfg.dotDir + "/")) + file; relToDotDir = file: (optionalString (cfg.dotDir != null) (cfg.dotDir + "/")) + file;
stateVersion = config.home.stateVersion;
bindkeyCommands = { bindkeyCommands = {
emacs = "bindkey -e"; emacs = "bindkey -e";
viins = "bindkey -v"; viins = "bindkey -v";
vicmd = "bindkey -a"; vicmd = "bindkey -a";
}; };
in
{
imports = [
(lib.mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestion" "enable" ])
(lib.mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
(lib.mkRenamedOptionModule [ "programs" "zsh" "zproof" ] [ "programs" "zsh" "zprof" ])
];
stateVersion = config.home.stateVersion; options =
let
historyModule = types.submodule ({ config, ... }: { historyModule = types.submodule ({ config, ... }: {
options = { options = {
append = mkOption { append = mkOption {
@ -271,15 +280,7 @@ let
}; };
}; };
}; };
in in {
{
imports = [
(lib.mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestion" "enable" ])
(lib.mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
(lib.mkRenamedOptionModule [ "programs" "zsh" "zproof" ] [ "programs" "zsh" "zprof" ])
];
options = {
programs.zsh = { programs.zsh = {
enable = mkEnableOption "Z shell (Zsh)"; enable = mkEnableOption "Z shell (Zsh)";
@ -709,7 +710,7 @@ in
lib.escapeShellArg lib.escapeShellArg
"(${lib.concatStringsSep "|" cfg.history.ignorePatterns})" "(${lib.concatStringsSep "|" cfg.history.ignorePatterns})"
}"} }"}
${if lib.versionAtLeast config.home.stateVersion "20.03" then ${if lib.versionAtLeast stateVersion "20.03" then
''HISTFILE="${cfg.history.path}"'' ''HISTFILE="${cfg.history.path}"''
else else
''HISTFILE="$HOME/${cfg.history.path}"''} ''HISTFILE="$HOME/${cfg.history.path}"''}