From 94ea2cb536fa083665e12d08515d97313e0900f1 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 19 Mar 2025 15:49:40 -0500 Subject: [PATCH] treewide: zsh initExtraBeforeCompInit -> initContent Migrating in tree usages of zsh initExtraBeforeCompInit to initContent before deprecating, matching priority of current option. --- modules/programs/antidote.nix | 6 +++--- modules/programs/dircolors.nix | 4 ++-- modules/programs/zplug.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/programs/antidote.nix b/modules/programs/antidote.nix index 8db5a9a82..8cf3d5a48 100644 --- a/modules/programs/antidote.nix +++ b/modules/programs/antidote.nix @@ -31,12 +31,12 @@ in { config = mkIf cfg.enable { home.packages = [ cfg.package ]; - programs.zsh.initExtraBeforeCompInit = let + programs.zsh.initContent = let configFiles = pkgs.runCommand "hm_antidote-files" { } '' echo "${zPluginStr cfg.plugins}" > $out ''; hashId = parseHashId "${configFiles}"; - in '' + in (mkOrder 550 '' ## home-manager/antidote begin : source ${cfg.package}/share/antidote/antidote.zsh ${optionalString cfg.useFriendlyNames @@ -50,6 +50,6 @@ in { antidote load $bundlefile $staticfile ## home-manager/antidote end - ''; + ''); }; } diff --git a/modules/programs/dircolors.nix b/modules/programs/dircolors.nix index 240be4a27..85c1b4333 100644 --- a/modules/programs/dircolors.nix +++ b/modules/programs/dircolors.nix @@ -207,9 +207,9 @@ in { ''; # Set `LS_COLORS` before Oh My Zsh and `initExtra`. - programs.zsh.initExtraBeforeCompInit = mkIf cfg.enableZshIntegration '' + programs.zsh.initContent = mkIf cfg.enableZshIntegration (mkOrder 550 '' eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolorsPath}) - ''; + ''); } (mkIf (!config.home.preferXdgDirectories) { home.file.".dir_colors".text = dircolorsConfig; diff --git a/modules/programs/zplug.nix b/modules/programs/zplug.nix index 94e3173a4..8c47915f8 100644 --- a/modules/programs/zplug.nix +++ b/modules/programs/zplug.nix @@ -44,7 +44,7 @@ in { config = mkIf cfg.enable { home.packages = [ pkgs.zplug ]; - programs.zsh.initExtraBeforeCompInit = '' + programs.zsh.initContent = mkOrder 550 '' export ZPLUG_HOME=${cfg.zplugHome} source ${pkgs.zplug}/share/zplug/init.zsh