X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=ax.zsh;h=23eda0166f99d31368b2f0e19cec0de2f5acaef1;hb=a81d28cbdc90f77c80e489c21723367dfa019fe7;hp=556061a36f096b436c7df7196462467c7192145f;hpb=fe6959e4f89fd3b412c993b02c5ed6eb1771aa08;p=ax-zsh.git

diff --git a/ax.zsh b/ax.zsh
index 556061a..23eda01 100644
--- a/ax.zsh
+++ b/ax.zsh
@@ -1,9 +1,75 @@
 # AX-ZSH: Alex' Modular ZSH Configuration
-# Copyright (c) 2015-2017 Alexander Barton <alex@barton.de>
+# Copyright (c) 2015-2020 Alexander Barton <alex@barton.de>
 
 script_name="${${(%):-%N}:t}"
 script_type="$script_name[2,-1]"
 
+# Handle "initialization stage", load all plugins of that stage, either from an
+# existing cache file or individually, optionally creating the cache.
+# - $1: Script name
+# - $2: Stage name (ax-io, zprofile, zshrc, zlogin, zlogout)
+function axzsh_handle_stage {
+	name="$1"
+	type="$2"
+
+	[[ -n "$AXZSH_DEBUG" ]] && echo "» $name ($type):"
+
+	# Initialize cache
+	mkdir -p "$AXZSH/cache"
+	cache_file="$AXZSH/cache/$type.cache"
+
+	cat_cmd=${commands[cat]:-cat}
+
+	if [[ -r "$cache_file" ]]; then
+		# Cache file exists, use it!
+		# But when in the "zshrc" stage, make sure that the "zprofile" stage
+		# has already been handled (this uses the "01_zprofile" plugin which
+		# is used in the "zshrc.cache" as well, but can't be used successfully
+		# there because it becomes sourced inside of a ZSH function; so we have
+		# to source it here in the global context manually ...):
+		[[ -z "$AXZSH_ZPROFILE_READ" && "$type" = "zshrc" ]] \
+			&& source "$AXZSH/core/01_zprofile/01_zprofile.zshrc"
+		[[ -n "$AXZSH_DEBUG" ]] \
+			&& echo "   - Reading cache file \"$cache_file\" ..."
+		source "$cache_file"
+		unfunction ax_plugin_init
+	else
+		# No cache file available.
+		# Setup list of plugins to load:
+		typeset -U plugin_list
+		plugin_list=(
+			"$AXZSH/core/"[0-5]*
+			"$AXZSH/active_plugins/"*(N)
+			"$AXZSH/core/"[6-9]*
+		)
+
+		# Create new cache file:
+		if [[ -n "$cache_file" ]]; then
+			[[ -n "$AXZSH_DEBUG" ]] \
+				&& echo "   (Writing new cache file to \"$cache_file\" ...)"
+			printf "# %s\n\n" "$(LC_ALL=C date)" >"$cache_file"
+		fi
+
+		# Read in all the plugins for the current "type":
+		for plugin ($plugin_list); do
+			# Read the "theme file", if any and in "zshrc" stage.
+			# This must be done before 99_cleanup is run!
+			if [[ "$plugin:t" == "99_cleanup" && "$type" = "zshrc" ]]; then
+				if [[ -r "$AXZSH_THEME" ]]; then
+					source "$AXZSH_THEME"
+					if [[ -n "$cache_file" ]]; then
+						# Source the theme in the new cache file:
+						echo "# BEGIN Theme" >>"$cache_file"
+						echo 'source "$AXZSH_THEME"' >>"$cache_file"
+						echo "# END Theme" >>"$cache_file"
+					fi
+				fi
+			fi
+			axzsh_load_plugin "$plugin" "$type" "$cache_file"
+		done
+	fi
+}
+
 # Load plugin code of a given type.
 # - $1: plugin name
 # - $2: plugin type (optional; defaults to "zshrc")
@@ -34,19 +100,29 @@ function axzsh_load_plugin {
 	fi
 
 	if [[ ! -r "$fname" && "$type" == "zshrc" ]]; then
-		if [[ -r "$dname/$plugin.zprofile" || -r "$dname/$plugin.zlogout" ]]; then
+		zsh_themes=("$dname/"*.zsh-theme(NY1))
+		if [[ -r "$dname/$plugin.ax-io" || -r "$dname/$plugin.zprofile" || -r "$dname/$plugin.zlogout" ]]; then
 			# Native AX-ZSH plugin, but for different stage. Skip it!
 			:
 		elif [[ -r "$dname/${plugin_short}.plugin.zsh" ]]; then
 			# Oh My ZSH plugin
 			type="plugin.zsh"
 			fname="$dname/${plugin_short}.plugin.zsh"
+		elif [[ -r "$dname/${plugin_short##zsh-}.plugin.zsh" ]]; then
+			# Oh My ZSH plugin with "zsh-" prefix stripped
+			type="plugin.zsh"
+			fname="$dname/${plugin_short##zsh-}.plugin.zsh"
 		elif [[ -r "$dname/init.zsh" ]]; then
 			# Prezto module
 			type="init.zsh"
 			fname="$dname/init.zsh"
+		elif [[ ${#zsh_themes} -gt 0 ]]; then
+			# ZSH "theme plugin", ignore here!
+			:
 		else
 			echo "AX-ZSH plugin type of \"$plugin\" unknown, skipped!" >&2
+			echo "Contents of \"$dname\":" >&2
+			ls -lh "$dname/" >&2
 			return 0
 		fi
 	fi
@@ -56,27 +132,46 @@ function axzsh_load_plugin {
 		[[ -n "$AXZSH_DEBUG" ]] \
 			&& echo "   - $plugin ($type): functions ..."
 		axzsh_fpath+=("$dname/functions")
+
+		# Add function path to cache file.
+		[[ -n "$cache_file" ]] \
+			&& echo "axzsh_fpath+=('$dname/functions')" >>$cache_file
 	fi
 
 	if [[ -r "$fname" ]]; then
 		# Read plugin ...
 		[[ -n "$AXZSH_DEBUG" ]] \
 			&& echo "   - $plugin ($type) ..."
-		source "$fname"
+
+		# Note for "external" ("repo/*") plugins and unusual ("not so
+		# modern") terminals: These (modern?) plugins most probably
+		# don't expect such a terminal configuration and don't behave
+		# well (echo color sequences, for example). Therefore we DON'T
+		# load any external plugins at all in that case: this results in
+		# reduced/disabled functionality, but hopefully in readable
+		# output ...
+
+		case "$fname" in
+			*"/repos/"*)
+				axzsh_is_modern_terminal && source "$fname"
+				;;
+			*)
+				source "$fname"
+		esac
 
 		if [[ -n "$cache_file" ]]; then
 			# Add plugin data to cache
-			printf "# BEGIN: %s\ninit()\n{\n" "$fname" >>"$cache_file"
+			printf "# BEGIN: %s\nax_plugin_init()\n{\n" "$fname" >>"$cache_file"
 			case "$fname" in
 				*"/repos/"*)
 					echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type): \"$fname\" ...'" >>$cache_file
-					echo "source '$fname'" >>$cache_file
+					echo "axzsh_is_modern_terminal && source '$fname'" >>$cache_file
 					;;
 				*)
 					echo "[[ -n \"\$AXZSH_DEBUG\" ]] && echo '     - $plugin ($type, cached) ...'" >>$cache_file
 					"$cat_cmd" "$fname" >>"$cache_file"
 			esac
-			printf "}\ninit\n# END: %s\n\n" "$fname" >>"$cache_file"
+			printf "}\nax_plugin_init\n# END: %s\n\n" "$fname" >>"$cache_file"
 		fi
 	fi
 
@@ -106,45 +201,27 @@ if [[ -z "$AXZSH" ]]; then
 	fi
 fi
 
-[[ -n "$AXZSH_DEBUG" ]] && echo "» $script_name:"
-
-# Initialize cache
-mkdir -p "$AXZSH/cache"
-cache_file="$AXZSH/cache/$script_type.cache"
-
-cat_cmd=${commands[cat]:-cat}
-
-if [[ -r "$cache_file" ]]; then
-	# Cache file exists, use it!
-	[[ -n "$AXZSH_DEBUG" ]] \
-		&& echo "   - Reading cache file \"$cache_file\" ..."
-	source "$cache_file"
-else
-	# No cache file available.
-	# Setup list of plugins to load:
-	typeset -U plugin_list
-	plugin_list=(
-		"$AXZSH/core/"[0-5]*
-		"$AXZSH/active_plugins/"*(N)
-		"$AXZSH/core/"[6-9]*
-	)
-
-	# Create new cache file:
-	if [[ -n "$cache_file" ]]; then
-		[[ -n "$AXZSH_DEBUG" ]] \
-			&& echo "   (Writing new cache file to \"$cache_file\" ...)"
-		printf "# %s\n\n" "$(LC_ALL=C date)" >"$cache_file"
-	fi
+if [[ "$script_type" = "zprofile" ]]; then
+	# Load all "output" plugins first, that is, before the "zprofile stage":
+	axzsh_handle_stage "$script_name" "ax-io"
+fi
 
-	# Read in all the plugins for the current "type":
-	for plugin ($plugin_list); do
-		axzsh_load_plugin "$plugin" "$script_type" "$cache_file"
-	done
+# 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 ...
-unfunction axzsh_load_plugin
-unset script_name script_type plugin
-unset plugin_list
-unset cache_file
-unset cat_cmd
+unfunction axzsh_handle_stage axzsh_load_plugin
+unset script_name script_type