X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/ad7a214d01c42b9c784e5d2b79466ec25f56bd22..6f7715ef506f39a0b0d9a5cd2afc7ed7a7202064:/runcoms/zshrc diff --git a/runcoms/zshrc b/runcoms/zshrc index 808616a..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" @@ -29,11 +28,10 @@ export TERM=xterm-256color-italic # Paths # export JAVA_HOME=$(/usr/libexec/java_home) # Enable if using JDK, otherwise disable for performance export GOPATH=$HOME/Projects/go -export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH export ANDROID_HOME=$HOME/Library/Android/sdk export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk-bundle export NVM_DIR=$HOME/.nvm -export PATH=$PATH:$HOME:/usr/local/opt/go/libexec/bin:${GOPATH//://bin:}/bin +export PATH=$PATH:$HOME:${GOPATH//://bin:}/bin export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:/Applications/calibre.app/Contents/MacOS # Editor. @@ -44,7 +42,6 @@ export VISUAL="nvim" export VIRTUAL_ENV_DISABLE_PROMPT=1 export WORKON_HOME=$HOME/.virtualenvs export PROJECT_HOME=$HOME/Documents/projects -export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3" # GPG export GPG_TTY=$(tty) @@ -103,5 +100,9 @@ if ! command -v brew &> /dev/null; then . $HOME/.asdf/asdf.sh fi else - . $(brew --prefix asdf)/asdf.sh + . $(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