Improve zsh startup and prompt timing

Author: Braden1996

dot_config/starship.toml

@@ -17,7 +17,7 @@ continuation_prompt = "[▸▹ ](overlay1)"
 format = """$username$hostname$container$directory$git_branch$git_status$git_state $character"""
 
 # Right side: metadata only (startup/duration/time)
-right_format = """$custom$cmd_duration$time"""
+right_format = """${env_var.ZSH_STARTUP_MS}$cmd_duration$time"""
 
 # =============================================================================
 # Character Module (Runes!)
@@ -322,14 +322,12 @@ Void = " "
 Windows = "󰍲 "
 
 # =============================================================================
-# Custom Modules
+# Environment Modules
 # =============================================================================
-[custom.startup]
-command = "echo ${ZSH_STARTUP_MS}ms"
-when = '[ -n "$ZSH_STARTUP_MS" ]'
-format = "[󱎫 $output]($style) "
+[env_var.ZSH_STARTUP_MS]
+variable = "ZSH_STARTUP_MS"
+format = "[󱎫 ${env_value}ms]($style) "
 style = "overlay1"
-shell = ["sh"]
 
 # =============================================================================
 # Color Palette (must be at the end of the file)

dot_config/zsh/20-plugins.zsh

@@ -6,6 +6,11 @@
 STARSHIP_PROMPT_NEED_NEWLINE=false
 zstyle ':zephyr:plugin:prompt' theme 'starship'
 zstyle ':zephyr:plugin:prompt' use-cache yes
+zstyle ':zephyr:plugin:prompt' immediate yes
+
+# Completion configuration
+zstyle ':zephyr:plugin:completion' use-cache yes
+zstyle ':zephyr:plugin:completion' immediate yes
 
 # Magic enter configuration (must be before magic-enter plugin loads)
 MAGIC_ENTER_GIT_COMMAND="git status -u ."
@@ -18,21 +23,25 @@ ZSH_AUTOSUGGEST_MANUAL_REBIND=1
 
 # Set ANTIDOTE_HOME default if not set (Homebrew, then git clone fallback)
 if [[ -z "$ANTIDOTE_HOME" ]]; then
-  if [[ -d "${HOMEBREW_PREFIX:-/opt/homebrew}/opt/antidote/share/antidote" ]]; then
-    ANTIDOTE_HOME="${HOMEBREW_PREFIX:-/opt/homebrew}/opt/antidote/share/antidote"
-  else
-    ANTIDOTE_HOME="${ZDOTDIR:-$HOME}/.antidote"
-  fi
+  ANTIDOTE_HOME="${XDG_CACHE_HOME:-$HOME/Library/Caches}/antidote"
 fi
 
 # Load antidote (with error handling)
-if [[ -f "$ANTIDOTE_HOME/antidote.zsh" ]]; then
-  source "$ANTIDOTE_HOME/antidote.zsh"
+local antidote_script=""
+if [[ -f "${HOMEBREW_PREFIX:-/opt/homebrew}/opt/antidote/share/antidote/antidote.zsh" ]]; then
+  antidote_script="${HOMEBREW_PREFIX:-/opt/homebrew}/opt/antidote/share/antidote/antidote.zsh"
+elif [[ -f "$ANTIDOTE_HOME/antidote.zsh" ]]; then
+  antidote_script="$ANTIDOTE_HOME/antidote.zsh"
+fi
+
+if [[ -n "$antidote_script" ]]; then
+  source "$antidote_script"
 else
-  print -P "%F{red}[zshrc] antidote not found at $ANTIDOTE_HOME%f" >&2
+  print -P "%F{red}[zshrc] antidote not found (cache: $ANTIDOTE_HOME)%f" >&2
   print -P "%F{yellow}  Install: brew install antidote%f" >&2
   return 1
 fi
+unset antidote_script
 
 # Static plugin loading (faster than dynamic)
 # Regenerate with: antidote bundle < ~/.zsh_plugins.txt > ~/.zsh_plugins.zsh

dot_config/zsh/70-keybindings.zsh

@@ -46,8 +46,8 @@ fi
 # Yazi file picker
 bindkey '^y' yazi_choose  # Ctrl+y triggers yazi-based "completion"
 
-# Clipboard support for zsh-shift-select (deferred with the plugin)
-zsh-defer -c '
+# Clipboard support for zsh-shift-select
+if bindkey -M shift-select >/dev/null 2>&1; then
   shift-select-copy() {
     if (( REGION_ACTIVE )); then
       zle copy-region-as-kill
@@ -58,7 +58,7 @@ zsh-defer -c '
   }
   zle -N shift-select-copy
   bindkey -M shift-select "^[[99;9u" shift-select-copy
-'
+fi
 
 # Debug: test if Ghostty sequence arrives at all (bind in main keymap too)
 debug-ghostty-seq() {

dot_config/zsh/99-local.zsh.tmpl

@@ -3,11 +3,11 @@
 # =============================================================================
 # Machine-specific configuration that shouldn't be committed
 
-# Nx completion (deferred)
-zsh-defer -c '[ -s "$HOME/.nx-completion/nx-completion.plugin.zsh" ] && source "$HOME/.nx-completion/nx-completion.plugin.zsh"'
+# Nx completion
+[[ -s "$HOME/.nx-completion/nx-completion.plugin.zsh" ]] && source "$HOME/.nx-completion/nx-completion.plugin.zsh"
 
-# Bun completions (deferred)
-zsh-defer -c '[ -s "$HOME/.bun/_bun" ] && source "$HOME/.bun/_bun"'
+# Bun completions
+[[ -s "$HOME/.bun/_bun" ]] && source "$HOME/.bun/_bun"
 
 # 1Password-backed secrets
 # To enable 1Password integration, uncomment and adjust the op:// URIs below.
@@ -17,7 +17,7 @@ zsh-defer -c '[ -s "$HOME/.bun/_bun" ] && source "$HOME/.bun/_bun"'
 # Safe-chain initialization
 [[ -f ~/.safe-chain/scripts/init-posix.sh ]] && source ~/.safe-chain/scripts/init-posix.sh
 
-# Clear startup time after first command so it only shows on the initial prompt
+# Clear startup time after first command so it only shows on the initial prompt.
 _clear_startup_time() {
   unset ZSH_STARTUP_MS
   add-zsh-hook -d preexec _clear_startup_time

dot_zprofile

@@ -1 +1,6 @@
-eval "$(/opt/homebrew/bin/brew shellenv)"
+export HOMEBREW_PREFIX="/opt/homebrew"
+export HOMEBREW_CELLAR="$HOMEBREW_PREFIX/Cellar"
+export HOMEBREW_REPOSITORY="$HOMEBREW_PREFIX"
+export PATH="$HOMEBREW_PREFIX/bin:$HOMEBREW_PREFIX/sbin:$PATH"
+export INFOPATH="$HOMEBREW_PREFIX/share/info:${INFOPATH:-}"
+[[ -n ${MANPATH-} ]] && export MANPATH=":${MANPATH#:}"

dot_zsh_plugins.txt

@@ -4,23 +4,23 @@ mattmc3/zephyr path:plugins/prompt
 mattmc3/zephyr path:plugins/completion
 mattmc3/zephyr path:plugins/compstyle
 
-# Git aliases (deferred)
-ohmyzsh/ohmyzsh path:plugins/git kind:defer
+# Git aliases
+ohmyzsh/ohmyzsh path:plugins/git
 
 # Completions
 zsh-users/zsh-completions
 
 # Navigation & Search (core functionality)
 zimfw/fzf
-Aloxaf/fzf-tab kind:defer
-jirutka/zsh-shift-select kind:defer
+Aloxaf/fzf-tab
+jirutka/zsh-shift-select
 
-# Deferred plugins (loaded after prompt appears)
-zsh-users/zsh-autosuggestions kind:defer
-hlissner/zsh-autopair kind:defer
-MichaelAquilina/zsh-you-should-use kind:defer
-wfxr/forgit kind:defer
+# Interactive plugins
+zsh-users/zsh-autosuggestions
+hlissner/zsh-autopair
+MichaelAquilina/zsh-you-should-use
+wfxr/forgit
 
 # Syntax highlighting - skip if using Warp (has built-in highlighting)
 # To disable: comment out the line below and regenerate plugins
-zdharma-continuum/fast-syntax-highlighting kind:defer
+zdharma-continuum/fast-syntax-highlighting

dot_zshenv.tmpl

@@ -1,6 +1,10 @@
-. "$HOME/.cargo/env"
-{{ if eq .chezmoi.arch "arm64" -}}
-ANTIDOTE_HOME="/opt/homebrew/opt/antidote/share/antidote"
-{{ else -}}
-ANTIDOTE_HOME="/usr/local/opt/antidote/share/antidote"
-{{ end -}}
+if [[ -d "$HOME/.cargo/bin" ]] && [[ ":$PATH:" != *":$HOME/.cargo/bin:"* ]]; then
+  export PATH="$HOME/.cargo/bin:$PATH"
+fi
+ANTIDOTE_HOME="${XDG_CACHE_HOME:-$HOME/Library/Caches}/antidote"
+
+# Record interactive shell startup from the earliest user startup file.
+if [[ -o interactive ]]; then
+  zmodload zsh/datetime 2>/dev/null
+  typeset -gF _ZSH_START_REAL=$EPOCHREALTIME
+fi

dot_zshrc

@@ -4,17 +4,18 @@
 # Modular config loaded from ~/.config/zsh/
 # To check dependencies: zsh-check-deps
 
-# Record startup start time (nanoseconds)
-zmodload zsh/datetime
-typeset -gF _ZSH_START_REAL=$EPOCHREALTIME
-
 # Source all config files in order
 for config in ~/.config/zsh/[0-9]*.zsh(N); do
   source "$config"
 done
 unset config
 
-# Calculate startup duration and export for starship
-export ZSH_STARTUP_MS=$(( (EPOCHREALTIME - _ZSH_START_REAL) * 1000 ))
-ZSH_STARTUP_MS=${ZSH_STARTUP_MS%%.*}
-unset _ZSH_START_REAL
+# Flush any remaining Zephyr post-zshrc hooks before the first prompt.
+(( $+functions[run_post_zshrc] )) && run_post_zshrc
+
+# Finalize startup timing after all startup hooks have run.
+if [[ -n "${_ZSH_START_REAL-}" ]]; then
+  export ZSH_STARTUP_MS=$(( (EPOCHREALTIME - _ZSH_START_REAL) * 1000 ))
+  ZSH_STARTUP_MS=${ZSH_STARTUP_MS%%.*}
+  unset _ZSH_START_REAL
+fi