From: Alexander Barton <alex@barton.de>
Date: Sat, 26 Dec 2020 19:55:20 +0000 (+0100)
Subject: Move 3rd-party integration into axzsh_handle_stage()
X-Git-Url: https://arthur.barton.de/gitweb/?a=commitdiff_plain;ds=sidebyside;h=5ba7f1bf900a6b4ecf42e4308ceff05343f9212a;p=ax-zsh.git

Move 3rd-party integration into axzsh_handle_stage()
---

diff --git a/ax.zsh b/ax.zsh
index 909c42f..b0b1d73 100644
--- a/ax.zsh
+++ b/ax.zsh
@@ -14,6 +14,20 @@ function axzsh_handle_stage {
 
 	[[ -n "$AXZSH_DEBUG" ]] && echo "» $name ($type):"
 
+	# Look for some 3rd-party integrations ...
+
+	# --- Powerlevel10k ---
+	# Read in Powerlevel10k configuration file, if not already read:
+	[[ -z "$POWERLEVEL9K_CONFIG_FILE" && -r ~/.p10k.zsh ]] && source ~/.p10k.zsh
+	# Enable instant prompt. Should stay close to the top of ~/.zshrc.
+	# Initialization code that may require console input (password prompts,
+	# [y/n] confirmations, etc.) must be executed before this, so all ax-zsh
+	# plugings should do output in their "zprofile" stage!
+	if [[ "$type" == "zprofile" ]]; then
+		p10k_instant_prompt="${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+		[[ -r "$p10k_instant_prompt" ]] && source "$p10k_instant_prompt"
+	fi
+
 	# Initialize cache
 	mkdir -p "$AXZSH/cache"
 	cache_file="$AXZSH/cache/$type.cache"
@@ -208,20 +222,6 @@ if [[ "$script_type" = "zprofile" ]]; then
 	axzsh_handle_stage "$script_name" "ax-io"
 fi
 
-# Look for some 3rd-party integrations ...
-
-# --- Powerlevel10k ---
-# Read in Powerlevel10k configuration file, if not already read:
-[[ -z "$POWERLEVEL9K_CONFIG_FILE" && -r ~/.p10k.zsh ]] && source ~/.p10k.zsh
-# Enable instant prompt. Should stay close to the top of ~/.zshrc.
-# Initialization code that may require console input (password prompts,
-# [y/n] confirmations, etc.) must be executed before this, so all ax-zsh
-# plugings should do output in their "zprofile" stage!
-if [[ "$script_type" == "zprofile" ]]; then
-	p10k_instant_prompt="${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-	[[ -r "$p10k_instant_prompt" ]] && source "$p10k_instant_prompt"
-fi
-
 axzsh_handle_stage "$script_name" "$script_type"
 
 # Clean up ...