Skip to content

Commit 8f84c96

Browse files
authored
Merge pull request #550 from jbhannah/jbhannah/nix-zsh-init-content
replace deprecated zsh.initExtra with initContent
2 parents 2fcc944 + 8ac1a5f commit 8f84c96

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

nix/shell-plugins.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ in
9595
'')
9696
pkg-exe-names;
9797
packages = lib.optional (cfg.package != null) cfg.package ++ cfg.plugins;
98+
initExtraPosix = strings.concatStringsSep "\n" posixFunctions;
9899
in
99100
mkIf cfg.enable (mkMerge [
100101
{
@@ -103,9 +104,9 @@ in
103104
(optionalAttrs is-home-manager {
104105
programs = {
105106
# for the Bash and Zsh home-manager modules,
106-
# the initExtra option is equivalent to Fish's interactiveShellInit
107-
bash.initExtra = strings.concatStringsSep "\n" posixFunctions;
108-
zsh.initExtra = strings.concatStringsSep "\n" posixFunctions;
107+
# the initExtra/initContent option is equivalent to Fish's interactiveShellInit
108+
bash.initExtra = initExtraPosix;
109+
zsh.initContent = initExtraPosix;
109110
};
110111
home = {
111112
inherit packages;

0 commit comments

Comments
 (0)