Skip to content

Commit 0e7e331

Browse files
committed
treewide: replace deprecated zsh initExtra options
1 parent 089a810 commit 0e7e331

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

home/base/non-nixos.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ in
8383
'')
8484
];
8585

86-
initExtra =
86+
initContent =
8787
mkIf config.custom.base.general.darwin (
8888
mkAfter ''
8989
export PATH="/opt/homebrew/bin:$PATH"

home/development/direnv/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ let
55
attrNames
66
mkEnableOption
77
mkIf
8+
mkOrder
89
;
910

1011
cfg = config.custom.development.direnv;
@@ -60,7 +61,7 @@ in
6061
'';
6162
};
6263

63-
zsh.initExtraBeforeCompInit = ''
64+
zsh.initContent = mkOrder 550 ''
6465
# is set in nix-shell
6566
if [[ ! -z "$buildInputs" ]]; then
6667
for buildInput in "''${(ps: :)buildInputs}"; do

home/programs/prompts/pure.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ in
2727
home.sessionVariables.PURE_GIT_PULL = 0;
2828

2929
programs.zsh = {
30-
initExtra = ''
30+
initContent = ''
3131
autoload -U promptinit; promptinit
3232
prompt pure
3333
'';

home/programs/zsh/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ in
4242
autosuggestion.enable = true;
4343
history.path = "${config.home.homeDirectory}/${dotDir}/.zsh_history";
4444

45-
initExtra = ''
45+
initContent = ''
4646
available sudo && alias sudo='nocorrect sudo '
4747
4848
alias -g C="| ${if config.custom.base.general.darwin then "pbcopy" else "${pkgs.xclip}/bin/xclip -selection clipboard"}"

hosts/R2026/home-tobiashapp.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
];
4848
};
4949

50-
programs.zsh.initExtra = lib.mkAfter ''
50+
programs.zsh.initContent = lib.mkAfter ''
5151
complete -C '${pkgs.awscli2}/bin/aws_completer' aws
5252
source <(kubectl completion zsh)
5353
'';

hosts/bwpm-FP2CYXKY2V/home-tobiashapp.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
];
7676
};
7777

78-
programs.zsh.initExtra = lib.mkAfter ''
78+
programs.zsh.initContent = lib.mkAfter ''
7979
source <(kubectl completion zsh)
8080
'';
8181
}

0 commit comments

Comments
 (0)