nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity

zsh: move deprecated options to separate file

Browse source 
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
This commit is contained in:
Austin Horstman 2025-07-11 22:48:35 -05:00
parent 80a07bc6f7
commit 26b987cf88
2 changed files with 81 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,19 +28,12 @@ let
in
{
imports = [
./deprecated.nix
./history.nix
./oh-my-zsh.nix
./prezto.nix
./zprof.nix
./zsh-abbr.nix
(lib.mkRenamedOptionModule
[ "programs" "zsh" "enableAutosuggestions" ]
[ "programs" "zsh" "autosuggestion" "enable" ]
)
(lib.mkRenamedOptionModule
[ "programs" "zsh" "enableSyntaxHighlighting" ]
[ "programs" "zsh" "syntaxHighlighting" "enable" ]
)
];
options =
@ -319,54 +312,6 @@ in
'';
};
initExtraBeforeCompInit = mkOption {
default = "";
type = types.lines;
apply =
x:
lib.warnIfNot (x == "") ''
`programs.zsh.initExtraBeforeCompInit` is deprecated, use `programs.zsh.initContent` with `lib.mkOrder 550` instead.
Example: programs.zsh.initContent = lib.mkOrder 550 "your content here";
'' x;
visible = false;
description = ''
Extra commands that should be added to {file}`.zshrc` before compinit.
'';
};
initExtra = mkOption {
default = "";
type = types.lines;
visible = false;
apply =
x:
lib.warnIfNot (x == "") ''
`programs.zsh.initExtra` is deprecated, use `programs.zsh.initContent` instead.
Example: programs.zsh.initContent = "your content here";
'' x;
description = ''
Extra commands that should be added to {file}`.zshrc`.
'';
};
initExtraFirst = mkOption {
default = "";
type = types.lines;
visible = false;
apply =
x:
lib.warnIfNot (x == "") ''
`programs.zsh.initExtraFirst` is deprecated, use `programs.zsh.initContent` with `lib.mkBefore` instead.
Example: programs.zsh.initContent = lib.mkBefore "your content here";
'' x;
description = ''
Commands that should be added to top of {file}`.zshrc`.
'';
};
envExtra = mkOption {
default = "";
type = types.lines;
@ -517,8 +462,6 @@ in
home.packages = [ cfg.package ] ++ lib.optional cfg.enableCompletion pkgs.nix-zsh-completions;
programs.zsh.initContent = lib.mkMerge [
(lib.mkIf (cfg.initExtraFirst != "") (lib.mkBefore cfg.initExtraFirst))
(mkOrder 510 "typeset -U path cdpath fpath manpath")
(lib.mkIf (cfg.cdpath != [ ]) (
@ -544,8 +487,6 @@ in
(lib.mkIf (localVarsStr != "") (mkOrder 540 localVarsStr))
(lib.mkIf (cfg.initExtraBeforeCompInit != "") (mkOrder 550 cfg.initExtraBeforeCompInit))
(lib.mkIf (cfg.plugins != [ ]) (
mkOrder 560 (
lib.concatStrings (
@ -604,8 +545,6 @@ in
''
))
(lib.mkIf (cfg.initExtra != "") cfg.initExtra)
(lib.mkIf (aliasesStr != "" || cfg.shellGlobalAliases != { }) (
mkOrder 1100 (
(optionalString (aliasesStr != "") aliasesStr)

80
modules/programs/zsh/deprecated.nix Normal file
View file

@ -0,0 +1,80 @@
{ config, lib, ... }:
let
inherit (lib) mkOption types;
cfg = config.programs.zsh;
in
{
imports = [
(lib.mkRenamedOptionModule
[ "programs" "zsh" "enableAutosuggestions" ]
[ "programs" "zsh" "autosuggestion" "enable" ]
)
(lib.mkRenamedOptionModule
[ "programs" "zsh" "enableSyntaxHighlighting" ]
[ "programs" "zsh" "syntaxHighlighting" "enable" ]
)
];
options = {
programs.zsh = {
initExtraBeforeCompInit = mkOption {
default = "";
type = types.lines;
apply =
x:
lib.warnIfNot (x == "") ''
`programs.zsh.initExtraBeforeCompInit` is deprecated, use `programs.zsh.initContent` with `lib.mkOrder 550` instead.
Example: programs.zsh.initContent = lib.mkOrder 550 "your content here";
'' x;
visible = false;
description = ''
Extra commands that should be added to {file}`.zshrc` before compinit.
'';
};
initExtra = mkOption {
default = "";
type = types.lines;
visible = false;
apply =
x:
lib.warnIfNot (x == "") ''
`programs.zsh.initExtra` is deprecated, use `programs.zsh.initContent` instead.
Example: programs.zsh.initContent = "your content here";
'' x;
description = ''
Extra commands that should be added to {file}`.zshrc`.
'';
};
initExtraFirst = mkOption {
default = "";
type = types.lines;
visible = false;
apply =
x:
lib.warnIfNot (x == "") ''
`programs.zsh.initExtraFirst` is deprecated, use `programs.zsh.initContent` with `lib.mkBefore` instead.
Example: programs.zsh.initContent = lib.mkBefore "your content here";
'' x;
description = ''
Commands that should be added to top of {file}`.zshrc`.
'';
};
};
};
config = {
programs.zsh.initContent = lib.mkMerge [
(lib.mkIf (cfg.initExtraFirst != "") (lib.mkBefore cfg.initExtraFirst))
(lib.mkIf (cfg.initExtraBeforeCompInit != "") (lib.mkOrder 550 cfg.initExtraBeforeCompInit))
(lib.mkIf (cfg.initExtra != "") cfg.initExtra)
];
};
}