X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/071e5a5319b45799c866af9113f6d47b10d81e4e..af913f93e5071e9b256c6c2314f141432df08bbd:/runcoms/zshrc?ds=inline

diff --git a/runcoms/zshrc b/runcoms/zshrc
index 5f0ed81..faf73a8 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,33 +28,31 @@ 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.
-export EDITOR="nvim"
-export VISUAL="nvim"
-
 # Python related variables
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 export WORKON_HOME=$HOME/.virtualenvs
-export PROJECT_HOME=$HOME/Projects
-export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3"
+export PROJECT_HOME=$HOME/Documents/projects
 
 # GPG
 export GPG_TTY=$(tty)
 
 # FZF Config
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+[ -f /usr/share/doc/fzf/examples/key-bindings.zsh ] && source /usr/share/doc/fzf/examples/key-bindings.zsh
+[ -f /usr/share/doc/fzf/examples/completion.zsh ] && source /usr/share/doc/fzf/examples/completion.zsh
+
 export FZF_DEFAULT_COMMAND='/usr/bin/env rg --color never --files --hidden -g \!.git'
 export FZF_DEFAULT_OPTS='--preview ''bat --style=numbers --color=always {} | head -500'''
 if [[ -s "/opt/homebrew/bin/brew" ]]; then
   export FZF_VIM_PATH=/opt/homebrew/opt/fzf
 else
-  if [[ -s "/opt/homebrew/bin/brew" ]]; then
+  if [[ -s "/usr/local/bin/brew" ]]; then
     export FZF_VIM_PATH=/usr/local/opt/fzf
   else
     export FZF_VIM_PATH=/usr/share/doc/fzf/examples
@@ -81,15 +78,27 @@ if [[ -s "/opt/homebrew/bin/brew" ]]; then
 fi
 
 # Z
-if ! command -v brew &>  /dev/null; then
-  . /usr/local/etc/profile.d/z.sh
-else
+if [[ -s "/opt/homebrew/bin/brew" ]]; then
   . /opt/homebrew/etc/profile.d/z.sh
+else
+  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