Upgrade to nixpkgs 25.05

modules/shell/zsh.nix

@@ -23,27 +23,32 @@ in
       enableCompletion = true;
       syntaxHighlighting.enable = true;
 
-      initExtra = ''
-        # Source generic (bash) configuration
-        if [ -d $HOME/.config/shell/sh ]; then
-          for rc in $HOME/.config/shell/sh/*.sh; do
-            emulate bash -c ". $rc"
-          done
-        fi
+      initContent = let
+        zshConfigBeforeCompInit = lib.mkOrder 550 ''
+          # p10k instant prompt
+          P10K_INSTANT_PROMPT="$XDG_CACHE_HOME/p10k-instant-prompt-''${(%):-%n}.zsh"
+          [[ ! -r "$P10K_INSTANT_PROMPT" ]] || source "$P10K_INSTANT_PROMPT"
+        '';
+        zshConfig = lib.mkOrder 1000 ''
+          # Source generic (bash) configuration
+          if [ -d $HOME/.config/shell/sh ]; then
+            for rc in $HOME/.config/shell/sh/*.sh; do
+              emulate bash -c ". $rc"
+            done
+          fi
 
-        # Source zsh specific configuration
-        if [[ -d $HOME/.config/shell/zsh ]]; then
-          for rc in $HOME/.config/shell/zsh/*.zsh; do
-            source $rc
-          done
-        fi
-      '';
-
-      initExtraBeforeCompInit = ''
-        # p10k instant prompt
-        P10K_INSTANT_PROMPT="$XDG_CACHE_HOME/p10k-instant-prompt-''${(%):-%n}.zsh"
-        [[ ! -r "$P10K_INSTANT_PROMPT" ]] || source "$P10K_INSTANT_PROMPT"
-      '';
+          # Source zsh specific configuration
+          if [[ -d $HOME/.config/shell/zsh ]]; then
+            for rc in $HOME/.config/shell/zsh/*.zsh; do
+              source $rc
+            done
+          fi
+        '';
+      in
+      lib.mkMerge [
+        zshConfigBeforeCompInit
+        zshConfig
+      ];
 
       oh-my-zsh = {
         enable = true;