Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(zsh): initialize aqua before other tools #337

Merged
merged 1 commit into from
Apr 10, 2024
Merged

fix(zsh): initialize aqua before other tools #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions config/.config/zsh/.zshrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand All @@ -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
Loading