From a238b94c55d77bd82a6e01675b96b35a14800580 Mon Sep 17 00:00:00 2001 From: izumin5210 Date: Wed, 10 Apr 2024 23:19:43 +0900 Subject: [PATCH] fix(zsh): initialize aqua before other tools --- config/.config/zsh/.zshrc | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/config/.config/zsh/.zshrc b/config/.config/zsh/.zshrc index 5734b39f..a24c4db5 100644 --- a/config/.config/zsh/.zshrc +++ b/config/.config/zsh/.zshrc @@ -67,8 +67,17 @@ compinit -C -d $XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION # Load plugins # ================================================================ -source $HOME/.config/zsh/legacy/functions.zsh -source $HOME/.config/zsh/legacy/fzf.zsh +# aqua +if type aqua >/dev/null 2>&1; then + source <(aqua completion zsh); + aqua install --all --only-link +fi + +# Sheldon +eval "$(sheldon source)" + +# Starship +eval "$(starship init zsh)" # direnv if type direnv > /dev/null 2>&1; then @@ -80,12 +89,6 @@ if type fnm >/dev/null 2>&1; then eval "$(fnm env --use-on-cd --log-level error)" fi -# aqua -if type aqua >/dev/null 2>&1; then - source <(aqua completion zsh); - aqua install --all --only-link -fi - # 1Password if [ -d "${HOME}/.config/op/plugins.sh" ]; then source "${HOME}/.config/op/plugins.sh" @@ -96,7 +99,5 @@ if [ -f "${HOME}/.orbstack/shell/init.zsh" ]; then source "${HOME}/.orbstack/shell/init.zsh" fi -# Starship -eval "$(starship init zsh)" - -eval "$(sheldon source)" +source $HOME/.config/zsh/legacy/fzf.zsh +source $HOME/.config/zsh/legacy/functions.zsh