Use nvim as git editor

[rbdr/dotfiles] / runcoms / zshrc

diff --git a/runcoms/zshrc b/runcoms/zshrc
index af64bbe8f6e034e75f8f144ace86b8a278f6fece..18aee8e95fd70fff42808b96d6bd81fbd6e3cf4d 100644 (file)
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -32,8 +32,6 @@ 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=/usr/local/bin:/usr/local/sbin:$PATH
-export PATH=$PATH:$HOME/Library/Python/2.7/bin
 export PATH=$PATH:$HOME:/usr/local/opt/go/libexec/bin:${GOPATH//://bin:}/bin
 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:/Applications/calibre.app/Contents/MacOS
 
@@ -45,14 +43,19 @@ export VISUAL="vim"
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 export WORKON_HOME=$HOME/.virtualenvs
 export PROJECT_HOME=$HOME/Projects
-export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python"
+export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3"
 
 # GPG
 export GPG_TTY=$(tty)
 
 # FZF Config
-export FZF_DEFAULT_COMMAND='/usr/local/bin/rg --color never --files --hidden -g \!.git'
+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
+  export FZF_VIM_PATH=/usr/local/opt/fzf
+fi
 
 ################################################################################
 # SECRET ENV VARS!!
@@ -69,3 +72,21 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zshrc.local" ]]; then
 fi
 
 eval $(/usr/libexec/path_helper -s)
+
+if [[ -s "/opt/homebrew/bin/brew" ]]; then
+  export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:$PATH
+fi
+
+# Z
+if ! command -v brew &>  /dev/null; then
+  . /usr/local/etc/profile.d/z.sh
+else
+  . /opt/homebrew/etc/profile.d/z.sh
+fi
+
+# ASDF
+if ! command -v brew &>  /dev/null; then
+  . $HOME/.asdf/asdf.sh
+else
+  . $(brew --prefix asdf)/asdf.sh
+fi