Use nvim for mergetool

[rbdr/dotfiles] / runcoms / zshrc

diff --git a/runcoms/zshrc b/runcoms/zshrc
index 9555055dc9c9b56dcaa2f9063c18e698644aa14c..faf73a85074b9aeda13ed6180ff8d49d367da6f7 100644 (file)
--- 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"
@@ -35,10 +34,6 @@ export NVM_DIR=$HOME/.nvm
 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
@@ -103,3 +98,7 @@ if ! command -v brew &>  /dev/null; then
 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