From 7c1cefb98369cc85440642fdccc1c1394ca6dd2c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 14 May 2025 00:33:51 +0100 Subject: [PATCH] zsh: avoid IFD while sourcing prezto --- modules/programs/zsh.nix | 5 +---- modules/programs/zsh/prezto.nix | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix index 26828889..a99cfdb9 100644 --- a/modules/programs/zsh.nix +++ b/modules/programs/zsh.nix @@ -815,10 +815,7 @@ in )) (mkOrder 900 ( - (optionalString cfg.prezto.enable ( - builtins.readFile "${cfg.prezto.package}/share/zsh-prezto/runcoms/zshrc" - )) - + (lib.concatStrings ( + (lib.concatStrings ( map (plugin: '' if [[ -f "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" ]]; then source "$HOME/${pluginsDir}/${plugin.name}/${plugin.file}" diff --git a/modules/programs/zsh/prezto.nix b/modules/programs/zsh/prezto.nix index f824c4dc..fbecb028 100644 --- a/modules/programs/zsh/prezto.nix +++ b/modules/programs/zsh/prezto.nix @@ -586,6 +586,11 @@ in ''} ${cfg.extraConfig} ''; + + programs.zsh.initContent = lib.mkOrder 850 '' + # Load prezto + source ${cfg.package}/share/zsh-prezto/runcoms/zshrc + ''; } ] );