From 15dc328179c67fdfe08256fdc8fe020860542cb7 Mon Sep 17 00:00:00 2001 From: Alec Rust Date: Sun, 30 Jul 2023 23:03:21 +0100 Subject: [PATCH] Improve .zshrc loading order --- dotfiles/.zshrc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc index a0f4522..913f221 100644 --- a/dotfiles/.zshrc +++ b/dotfiles/.zshrc @@ -34,6 +34,14 @@ export PATH="$PATH:/opt/X11/bin" # ==================== SOURCING SCRIPTS ==================== # +# Source .aliases and .extra if they exist +[[ -f $HOME/.aliases ]] && source "$HOME/.aliases" +[[ -f $HOME/.extra ]] && source "$HOME/.extra" + +# Source 1Password Shell Plugins +# https://developer.1password.com/docs/cli/shell-plugins/ +source "$HOME/.config/op/plugins.sh" + # Source Antidote source "$HOMEBREW_PREFIX/opt/antidote/share/antidote/antidote.zsh" @@ -43,19 +51,11 @@ export ZSH export ZSH_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/oh-my-zsh" [[ -d $ZSH_CACHE_DIR ]] || mkdir -p "$ZSH_CACHE_DIR" -# Load Antidote plugins +# Load Zsh plugins with Antidote antidote load -# Source 1Password Shell Plugins -# https://developer.1password.com/docs/cli/shell-plugins/ -source "$HOME/.config/op/plugins.sh" - # Source rtx eval "$(rtx activate zsh)" # Source Starship eval "$(starship init zsh)" - -# Source .aliases and .extra if they exist -[[ -f $HOME/.aliases ]] && source "$HOME/.aliases" -[[ -f $HOME/.extra ]] && source "$HOME/.extra"