X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/e4963fae03c4d4403fcca3157bebf5e47ef2010f..442118e66a483875ef14262d7b4a89c1fda0ae68:/runcoms/zshrc?ds=sidebyside

diff --git a/runcoms/zshrc b/runcoms/zshrc
index ea7d522..8df1b05 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"
@@ -28,23 +27,18 @@ export TERM=xterm-256color-italic
 
 # Paths
 # export JAVA_HOME=$(/usr/libexec/java_home) # Enable if using JDK, otherwise disable for performance
+export XDG_CONFIG_HOME=$HOME/.config
 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.
-export EDITOR="nvim"
-export VISUAL="nvim"
-
 # Python related variables
 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)
@@ -88,12 +82,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)/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