From 10deb9d043e625d8c6a629f5575718e0768dcfb4 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Wed, 19 Mar 2025 15:43:42 -0500
Subject: [PATCH] treewide: zsh initExtra -> initContent

Migrating in tree usages of zsh initExtra to initContent before
deprecating.
---
 modules/misc/vte.nix                          |  2 +-
 modules/programs/atuin.nix                    |  2 +-
 modules/programs/autojump.nix                 |  2 +-
 modules/programs/broot.nix                    |  2 +-
 modules/programs/carapace.nix                 |  2 +-
 .../command-not-found/command-not-found.nix   |  2 +-
 modules/programs/direnv.nix                   |  2 +-
 modules/programs/eww.nix                      |  2 +-
 modules/programs/fzf.nix                      |  2 +-
 modules/programs/ghostty.nix                  |  2 +-
 modules/programs/git-worktree-switcher.nix    |  2 +-
 modules/programs/granted.nix                  |  2 +-
 modules/programs/hstr.nix                     |  2 +-
 modules/programs/keychain.nix                 |  2 +-
 modules/programs/kitty.nix                    |  2 +-
 modules/programs/mcfly.nix                    |  2 +-
 modules/programs/mise.nix                     |  2 +-
 modules/programs/mods.nix                     |  2 +-
 modules/programs/navi.nix                     |  2 +-
 modules/programs/nix-index.nix                |  2 +-
 modules/programs/nix-your-shell.nix           |  2 +-
 modules/programs/oh-my-posh.nix               |  2 +-
 modules/programs/opam.nix                     |  2 +-
 modules/programs/pay-respects.nix             |  2 +-
 modules/programs/pazi.nix                     |  2 +-
 modules/programs/powerline-go.nix             | 39 ++++++++++---------
 modules/programs/pyenv.nix                    |  2 +-
 modules/programs/pywal.nix                    |  2 +-
 modules/programs/rbenv.nix                    |  2 +-
 modules/programs/scmpuff.nix                  |  2 +-
 modules/programs/skim.nix                     |  2 +-
 modules/programs/starship.nix                 |  2 +-
 modules/programs/thefuck.nix                  |  2 +-
 modules/programs/watson.nix                   |  2 +-
 modules/programs/wezterm.nix                  |  3 +-
 modules/programs/yazi.nix                     |  2 +-
 modules/programs/z-lua.nix                    |  2 +-
 modules/programs/zellij.nix                   |  2 +-
 modules/services/gpg-agent.nix                |  2 +-
 39 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/modules/misc/vte.nix b/modules/misc/vte.nix
index c734fd44..09862b41 100644
--- a/modules/misc/vte.nix
+++ b/modules/misc/vte.nix
@@ -45,7 +45,7 @@
     })
 
     (lib.mkIf config.programs.zsh.enableVteIntegration {
-      programs.zsh.initExtra = ''
+      programs.zsh.initContent = ''
         . ${pkgs.vte}/etc/profile.d/vte.sh
       '';
     })
diff --git a/modules/programs/atuin.nix b/modules/programs/atuin.nix
index 50e088b1..ccb4347f 100644
--- a/modules/programs/atuin.nix
+++ b/modules/programs/atuin.nix
@@ -114,7 +114,7 @@ in {
         fi
       '';
 
-      programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+      programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
         if [[ $options[zle] = on ]]; then
           eval "$(${lib.getExe cfg.package} init zsh ${flagsStr})"
         fi
diff --git a/modules/programs/autojump.nix b/modules/programs/autojump.nix
index 3177001c..3d7f1ad9 100644
--- a/modules/programs/autojump.nix
+++ b/modules/programs/autojump.nix
@@ -30,7 +30,7 @@ in {
       . ${package}/share/autojump/autojump.bash
     '');
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       . ${package}/share/autojump/autojump.zsh
     '';
 
diff --git a/modules/programs/broot.nix b/modules/programs/broot.nix
index c19534f1..8cc6338c 100644
--- a/modules/programs/broot.nix
+++ b/modules/programs/broot.nix
@@ -214,7 +214,7 @@ in {
 
     programs.bash.initExtra = mkIf cfg.enableBashIntegration (shellInit "bash");
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration (shellInit "zsh");
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration (shellInit "zsh");
 
     programs.fish.shellInit = mkIf cfg.enableFishIntegration (shellInit "fish");
 
diff --git a/modules/programs/carapace.nix b/modules/programs/carapace.nix
index 09cc5563..6d1b6f8a 100644
--- a/modules/programs/carapace.nix
+++ b/modules/programs/carapace.nix
@@ -37,7 +37,7 @@ in {
         source <(${bin} _carapace bash)
       '';
 
-      zsh.initExtra = mkIf cfg.enableZshIntegration ''
+      zsh.initContent = mkIf cfg.enableZshIntegration ''
         source <(${bin} _carapace zsh)
       '';
 
diff --git a/modules/programs/command-not-found/command-not-found.nix b/modules/programs/command-not-found/command-not-found.nix
index f1a79023..c539e6e2 100644
--- a/modules/programs/command-not-found/command-not-found.nix
+++ b/modules/programs/command-not-found/command-not-found.nix
@@ -47,7 +47,7 @@ in {
 
   config = mkIf cfg.enable {
     programs.bash.initExtra = shInit "command_not_found_handle";
-    programs.zsh.initExtra = shInit "command_not_found_handler";
+    programs.zsh.initContent = shInit "command_not_found_handler";
 
     home.packages = [ commandNotFound ];
   };
diff --git a/modules/programs/direnv.nix b/modules/programs/direnv.nix
index a387a4bc..644914d5 100644
--- a/modules/programs/direnv.nix
+++ b/modules/programs/direnv.nix
@@ -121,7 +121,7 @@ in {
         eval "$(${getExe cfg.package} hook bash)"
       '');
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       eval "$(${getExe cfg.package} hook zsh)"
     '';
 
diff --git a/modules/programs/eww.nix b/modules/programs/eww.nix
index 2559068a..2f59a50c 100644
--- a/modules/programs/eww.nix
+++ b/modules/programs/eww.nix
@@ -54,7 +54,7 @@ in {
       fi
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       if [[ $TERM != "dumb" ]]; then
         eval "$(${ewwCmd} shell-completions --shell zsh)"
       fi
diff --git a/modules/programs/fzf.nix b/modules/programs/fzf.nix
index 6f45682c..518ea22a 100644
--- a/modules/programs/fzf.nix
+++ b/modules/programs/fzf.nix
@@ -195,7 +195,7 @@ in {
     # Note, since fzf unconditionally binds C-r we use `mkOrder` to make the
     # initialization show up a bit earlier. This is to make initialization of
     # other history managers, like mcfly or atuin, take precedence.
-    programs.zsh.initExtra =
+    programs.zsh.initContent =
       mkIf cfg.enableZshIntegration (mkOrder 200 zshIntegration);
 
     programs.fish.interactiveShellInit =
diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix
index 383472ef..80845a27 100644
--- a/modules/programs/ghostty.nix
+++ b/modules/programs/ghostty.nix
@@ -194,7 +194,7 @@ in {
     })
 
     (lib.mkIf cfg.enableZshIntegration {
-      programs.zsh.initExtra = ''
+      programs.zsh.initContent = ''
         if [[ -n $GHOSTTY_RESOURCES_DIR ]]; then
           source "$GHOSTTY_RESOURCES_DIR"/shell-integration/zsh/ghostty-integration
         fi
diff --git a/modules/programs/git-worktree-switcher.nix b/modules/programs/git-worktree-switcher.nix
index cb38f2e6..df191ae7 100644
--- a/modules/programs/git-worktree-switcher.nix
+++ b/modules/programs/git-worktree-switcher.nix
@@ -33,7 +33,7 @@ in {
       optionalString cfg.enableBashIntegration (initScript "bash");
     programs.fish.interactiveShellInit =
       optionalString cfg.enableFishIntegration (initScript "fish");
-    programs.zsh.initExtra =
+    programs.zsh.initContent =
       optionalString cfg.enableZshIntegration (initScript "zsh");
   };
 }
diff --git a/modules/programs/granted.nix b/modules/programs/granted.nix
index 802cffea..9128a917 100644
--- a/modules/programs/granted.nix
+++ b/modules/programs/granted.nix
@@ -23,7 +23,7 @@ in {
   config = mkIf cfg.enable {
     home.packages = [ package ];
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       function assume() {
         export GRANTED_ALIAS_CONFIGURED="true"
         source ${package}/bin/assume "$@"
diff --git a/modules/programs/hstr.nix b/modules/programs/hstr.nix
index 6dc2c0a3..1af2fa0e 100644
--- a/modules/programs/hstr.nix
+++ b/modules/programs/hstr.nix
@@ -30,7 +30,7 @@ in {
       eval "$(${cfg.package}/bin/hstr --show-configuration)"
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       eval "$(${cfg.package}/bin/hstr --show-zsh-configuration)"
     '';
   };
diff --git a/modules/programs/keychain.nix b/modules/programs/keychain.nix
index c428f40c..efc30c7c 100644
--- a/modules/programs/keychain.nix
+++ b/modules/programs/keychain.nix
@@ -93,7 +93,7 @@ in {
     programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
       SHELL=fish eval (${shellCommand})
     '';
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       eval "$(SHELL=zsh ${shellCommand})"
     '';
     programs.nushell.extraConfig = mkIf cfg.enableNushellIntegration ''
diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix
index cc7e7b4d..9ccc87b5 100644
--- a/modules/programs/kitty.nix
+++ b/modules/programs/kitty.nix
@@ -282,7 +282,7 @@ in {
     programs.fish.interactiveShellInit =
       mkIf cfg.shellIntegration.enableFishIntegration shellIntegrationInit.fish;
 
-    programs.zsh.initExtra =
+    programs.zsh.initContent =
       mkIf cfg.shellIntegration.enableZshIntegration shellIntegrationInit.zsh;
   };
 }
diff --git a/modules/programs/mcfly.nix b/modules/programs/mcfly.nix
index 1e855555..ef5a98e6 100644
--- a/modules/programs/mcfly.nix
+++ b/modules/programs/mcfly.nix
@@ -141,7 +141,7 @@ in {
 
       programs.bash.initExtra = mkIf cfg.enableBashIntegration bashIntegration;
 
-      programs.zsh.initExtra = mkIf cfg.enableZshIntegration zshIntegration;
+      programs.zsh.initContent = mkIf cfg.enableZshIntegration zshIntegration;
 
       programs.fish.shellInit = mkIf cfg.enableFishIntegration fishIntegration;
 
diff --git a/modules/programs/mise.nix b/modules/programs/mise.nix
index 3ab26352..f4bbcade 100644
--- a/modules/programs/mise.nix
+++ b/modules/programs/mise.nix
@@ -108,7 +108,7 @@ in {
         eval "$(${getExe cfg.package} activate bash)"
       '';
 
-      zsh.initExtra = mkIf cfg.enableZshIntegration ''
+      zsh.initContent = mkIf cfg.enableZshIntegration ''
         eval "$(${getExe cfg.package} activate zsh)"
       '';
 
diff --git a/modules/programs/mods.nix b/modules/programs/mods.nix
index 95e5559b..17a108e2 100644
--- a/modules/programs/mods.nix
+++ b/modules/programs/mods.nix
@@ -65,7 +65,7 @@ in {
       source <(${cfg.package}/bin/mods completion bash)
     '');
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration (mkOrder 200 ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration (mkOrder 200 ''
       source <(${cfg.package}/bin/mods completion zsh)
     '');
 
diff --git a/modules/programs/navi.nix b/modules/programs/navi.nix
index e8399fd1..45c5003a 100644
--- a/modules/programs/navi.nix
+++ b/modules/programs/navi.nix
@@ -66,7 +66,7 @@ in {
       fi
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       if [[ $options[zle] = on ]]; then
         eval "$(${cfg.package}/bin/navi widget zsh)"
       fi
diff --git a/modules/programs/nix-index.nix b/modules/programs/nix-index.nix
index f483cd2b..23d3c979 100644
--- a/modules/programs/nix-index.nix
+++ b/modules/programs/nix-index.nix
@@ -41,7 +41,7 @@ in {
       source ${cfg.package}/etc/profile.d/command-not-found.sh
     '';
 
-    programs.zsh.initExtra = lib.mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = lib.mkIf cfg.enableZshIntegration ''
       source ${cfg.package}/etc/profile.d/command-not-found.sh
     '';
 
diff --git a/modules/programs/nix-your-shell.nix b/modules/programs/nix-your-shell.nix
index adace4e1..c39d3a50 100644
--- a/modules/programs/nix-your-shell.nix
+++ b/modules/programs/nix-your-shell.nix
@@ -45,7 +45,7 @@ in {
         '';
       };
 
-      zsh.initExtra = mkIf cfg.enableZshIntegration ''
+      zsh.initContent = mkIf cfg.enableZshIntegration ''
         ${cfg.package}/bin/nix-your-shell zsh | source /dev/stdin
       '';
     };
diff --git a/modules/programs/oh-my-posh.nix b/modules/programs/oh-my-posh.nix
index be406e66..dc666afb 100644
--- a/modules/programs/oh-my-posh.nix
+++ b/modules/programs/oh-my-posh.nix
@@ -71,7 +71,7 @@ in {
       eval "$(${cfg.package}/bin/oh-my-posh init bash ${configArgument})"
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       eval "$(${cfg.package}/bin/oh-my-posh init zsh ${configArgument})"
     '';
 
diff --git a/modules/programs/opam.nix b/modules/programs/opam.nix
index 6027737c..f71dd417 100644
--- a/modules/programs/opam.nix
+++ b/modules/programs/opam.nix
@@ -36,7 +36,7 @@ in {
       eval "$(${cfg.package}/bin/opam env --shell=bash)"
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       eval "$(${cfg.package}/bin/opam env --shell=zsh)"
     '';
 
diff --git a/modules/programs/pay-respects.nix b/modules/programs/pay-respects.nix
index 8802ad25..302d1b12 100644
--- a/modules/programs/pay-respects.nix
+++ b/modules/programs/pay-respects.nix
@@ -35,7 +35,7 @@ in {
         ''}
       '';
 
-      zsh.initExtra = ''
+      zsh.initContent = ''
         ${optionalString cfg.enableZshIntegration ''
           eval "$(${payRespectsCmd} zsh --alias)"
         ''}
diff --git a/modules/programs/pazi.nix b/modules/programs/pazi.nix
index 848dfa30..8e9838af 100644
--- a/modules/programs/pazi.nix
+++ b/modules/programs/pazi.nix
@@ -29,7 +29,7 @@ in {
       eval "$(${pkgs.pazi}/bin/pazi init bash)"
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       eval "$(${pkgs.pazi}/bin/pazi init zsh)"
     '';
 
diff --git a/modules/programs/powerline-go.nix b/modules/programs/powerline-go.nix
index 9bc9491b..520229c1 100644
--- a/modules/programs/powerline-go.nix
+++ b/modules/programs/powerline-go.nix
@@ -142,27 +142,28 @@ in {
         fi
       '';
 
-    programs.zsh.initExtra = mkIf (cfg.enable && config.programs.zsh.enable) ''
-      function powerline_precmd() {
-        ${
-          if evalMode then "eval " else "PS1="
-        }"$(${pkgs.powerline-go}/bin/powerline-go -error $? -shell zsh${commandLineArguments})"
-        ${cfg.extraUpdatePS1}
-      }
+    programs.zsh.initContent =
+      mkIf (cfg.enable && config.programs.zsh.enable) ''
+        function powerline_precmd() {
+          ${
+            if evalMode then "eval " else "PS1="
+          }"$(${pkgs.powerline-go}/bin/powerline-go -error $? -shell zsh${commandLineArguments})"
+          ${cfg.extraUpdatePS1}
+        }
 
-      function install_powerline_precmd() {
-        for s in "$\{precmd_functions[@]}"; do
-          if [ "$s" = "powerline_precmd" ]; then
-            return
-          fi
-        done
-        precmd_functions+=(powerline_precmd)
-      }
+        function install_powerline_precmd() {
+          for s in "$\{precmd_functions[@]}"; do
+            if [ "$s" = "powerline_precmd" ]; then
+              return
+            fi
+          done
+          precmd_functions+=(powerline_precmd)
+        }
 
-      if [ "$TERM" != "linux" ]; then
-        install_powerline_precmd
-      fi
-    '';
+        if [ "$TERM" != "linux" ]; then
+          install_powerline_precmd
+        fi
+      '';
 
     # https://github.com/justjanne/powerline-go#fish
     programs.fish.interactiveShellInit =
diff --git a/modules/programs/pyenv.nix b/modules/programs/pyenv.nix
index 1ff1f283..e18c7a92 100644
--- a/modules/programs/pyenv.nix
+++ b/modules/programs/pyenv.nix
@@ -54,7 +54,7 @@ in {
       eval "$(${lib.getExe cfg.package} init - bash)"
     '';
 
-    programs.zsh.initExtra = lib.mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = lib.mkIf cfg.enableZshIntegration ''
       export PYENV_ROOT="${cfg.rootDirectory}"
       eval "$(${lib.getExe cfg.package} init - zsh)"
     '';
diff --git a/modules/programs/pywal.nix b/modules/programs/pywal.nix
index b32f087c..c29ece0e 100644
--- a/modules/programs/pywal.nix
+++ b/modules/programs/pywal.nix
@@ -11,7 +11,7 @@ in {
 
     home.packages = [ pkgs.pywal ];
 
-    programs.zsh.initExtra = ''
+    programs.zsh.initContent = ''
       # Import colorscheme from 'wal' asynchronously
       # &   # Run the process in the background.
       # ( ) # Hide shell job control messages.
diff --git a/modules/programs/rbenv.nix b/modules/programs/rbenv.nix
index 11b48abf..59b9bba7 100644
--- a/modules/programs/rbenv.nix
+++ b/modules/programs/rbenv.nix
@@ -79,7 +79,7 @@ in {
       eval "$(${cfg.package}/bin/rbenv init - bash)"
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       eval "$(${cfg.package}/bin/rbenv init - zsh)"
     '';
 
diff --git a/modules/programs/scmpuff.nix b/modules/programs/scmpuff.nix
index f9ff922a..33642a35 100644
--- a/modules/programs/scmpuff.nix
+++ b/modules/programs/scmpuff.nix
@@ -45,7 +45,7 @@ in {
       eval "$(${cfg.package}/bin/scmpuff init ${mkArgs "bash"})"
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       eval "$(${cfg.package}/bin/scmpuff init ${mkArgs "zsh"})"
     '';
 
diff --git a/modules/programs/skim.nix b/modules/programs/skim.nix
index 0f47a00b..4c221548 100644
--- a/modules/programs/skim.nix
+++ b/modules/programs/skim.nix
@@ -114,7 +114,7 @@ in {
       fi
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       if [[ $options[zle] = on ]]; then
         . ${cfg.package}/share/skim/completion.zsh
         . ${cfg.package}/share/skim/key-bindings.zsh
diff --git a/modules/programs/starship.nix b/modules/programs/starship.nix
index bb1c87b9..c3b2a61a 100644
--- a/modules/programs/starship.nix
+++ b/modules/programs/starship.nix
@@ -106,7 +106,7 @@ in {
       fi
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       if [[ $TERM != "dumb" ]]; then
         eval "$(${starshipCmd} init zsh)"
       fi
diff --git a/modules/programs/thefuck.nix b/modules/programs/thefuck.nix
index 79b1f946..2561bf5f 100644
--- a/modules/programs/thefuck.nix
+++ b/modules/programs/thefuck.nix
@@ -57,7 +57,7 @@ with lib;
       };
     };
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration shEvalCmd;
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration shEvalCmd;
 
     programs.nushell = mkIf cfg.enableNushellIntegration {
       extraConfig = ''
diff --git a/modules/programs/watson.nix b/modules/programs/watson.nix
index 1f986455..f830d28d 100644
--- a/modules/programs/watson.nix
+++ b/modules/programs/watson.nix
@@ -80,7 +80,7 @@ in {
       source ${cfg.package}/share/bash-completion/completions/watson
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       source ${cfg.package}/share/zsh/site-functions/_watson
     '';
 
diff --git a/modules/programs/wezterm.nix b/modules/programs/wezterm.nix
index c1478d64..41e0a5be 100644
--- a/modules/programs/wezterm.nix
+++ b/modules/programs/wezterm.nix
@@ -108,6 +108,7 @@ in {
 
     programs.bash.initExtra =
       mkIf cfg.enableBashIntegration shellIntegrationStr;
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration shellIntegrationStr;
+    programs.zsh.initContent =
+      mkIf cfg.enableZshIntegration shellIntegrationStr;
   };
 }
diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix
index be77188b..59d734d3 100644
--- a/modules/programs/yazi.nix
+++ b/modules/programs/yazi.nix
@@ -196,7 +196,7 @@ in {
     in {
       bash.initExtra = mkIf cfg.enableBashIntegration bashIntegration;
 
-      zsh.initExtra = mkIf cfg.enableZshIntegration bashIntegration;
+      zsh.initContent = mkIf cfg.enableZshIntegration bashIntegration;
 
       fish.functions.${cfg.shellWrapperName} =
         mkIf cfg.enableFishIntegration fishIntegration;
diff --git a/modules/programs/z-lua.nix b/modules/programs/z-lua.nix
index 4164aa39..afbf4d28 100644
--- a/modules/programs/z-lua.nix
+++ b/modules/programs/z-lua.nix
@@ -56,7 +56,7 @@ in {
       })"
     '';
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration ''
       eval "$(${pkgs.z-lua}/bin/z --init zsh ${
         concatStringsSep " " cfg.options
       })"
diff --git a/modules/programs/zellij.nix b/modules/programs/zellij.nix
index 8d5f0005..3d5c0dd5 100644
--- a/modules/programs/zellij.nix
+++ b/modules/programs/zellij.nix
@@ -73,7 +73,7 @@ in {
       eval "$(${zellijCmd} setup --generate-auto-start bash)"
     '');
 
-    programs.zsh.initExtra = mkIf cfg.enableZshIntegration (mkOrder 200 ''
+    programs.zsh.initContent = mkIf cfg.enableZshIntegration (mkOrder 200 ''
       eval "$(${zellijCmd} setup --generate-auto-start zsh)"
     '');
 
diff --git a/modules/services/gpg-agent.nix b/modules/services/gpg-agent.nix
index f32d85af..48f1ae8c 100644
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@@ -300,7 +300,7 @@ in {
       '';
 
       programs.bash.initExtra = mkIf cfg.enableBashIntegration gpgInitStr;
-      programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgZshInitStr;
+      programs.zsh.initContent = mkIf cfg.enableZshIntegration gpgZshInitStr;
       programs.fish.interactiveShellInit =
         mkIf cfg.enableFishIntegration gpgFishInitStr;