X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/b945717bde6231332093f4715e492c8ed7c6bd8a..6f7715ef506f39a0b0d9a5cd2afc7ed7a7202064:/runcoms/zshrc diff --git a/runcoms/zshrc b/runcoms/zshrc index 153d73d..f1d97f6 100644 --- a/runcoms/zshrc +++ b/runcoms/zshrc @@ -1,7 +1,6 @@ ################################################################################ # Load Functions ################################################################################ -source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/git-info.zsh" source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/dotenv.zsh" source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/graphviz.zsh" source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/short-uptime.zsh" @@ -86,12 +85,24 @@ fi if [[ -s "/opt/homebrew/bin/brew" ]]; then . /opt/homebrew/etc/profile.d/z.sh else - . /usr/local/etc/profile.d/z.sh + if [[ -s "/usr/share/z/z.sh" ]]; then + . /usr/share/z/z.sh + else + . /usr/local/etc/profile.d/z.sh + fi fi # ASDF if ! command -v brew &> /dev/null; then - . $HOME/.asdf/asdf.sh + if [[ -s "/opt/asdf-vm/asdf.sh" ]]; then + . /opt/asdf-vm/asdf.sh + else + . $HOME/.asdf/asdf.sh + fi else . $(brew --prefix asdf)/libexec/asdf.sh fi + +if [[ -s "~/.asdf/plugins/java/set-java-home.zsh" ]]; then + . ~/.asdf/plugins/java/set-java-home.zsh +fi