From: Ruben Beltran del Rio <redacted>
Date: Wed, 14 Jul 2021 12:40:09 +0000 (+0200)
Subject: Adapt paths for new homebrew prefix
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/c01804a41ca4cc1df9feee0116d32af505623f59?hp=d5c4a1fd1996e4ca0df22f323077423924cf0252

Adapt paths for new homebrew prefix
---

diff --git a/runcoms/zshrc b/runcoms/zshrc
index 780b526..18aee8e 100644
--- 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
 
@@ -53,9 +51,11 @@ export GPG_TTY=$(tty)
 # FZF Config
 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'''
-
-# Z
-. /usr/local/etc/profile.d/z.sh
+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!!
@@ -71,8 +71,17 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zshrc.local" ]]; then
   source "${ZDOTDIR:-$HOME}/.zshrc.local"
 fi
 
-if command -v brew &>  /dev/null; then
-  eval $(/usr/libexec/path_helper -s)
+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
diff --git a/vimrc b/vimrc
index 3e5c937..4a38153 100755
--- a/vimrc
+++ b/vimrc
@@ -96,7 +96,7 @@ runtime! macros/matchit.vim
 highlight Keyword cterm=italic
 
 " FZF config
-set rtp+=/usr/local/opt/fzf
+set rtp+=$FZF_VIM_PATH
 
 " Inserts the path of the currently edited file into a command
 noremap <C-P> :FZF <CR>