Fix paths for Homebrew

Signed-off-by: Timo Sand <[email protected]>

Author: deiga

Rakefile

@@ -381,7 +381,7 @@ def install_zsh_completions
 end
 
 def update_antidote
-  system %(zsh -c 'source ${ZDOTDIR:-~}/.antidote/antidote.zsh; antidote update &; antidote bundle <$HOME/.zsh/plugins/plugins.txt >$HOME/.zsh/plugins.zsh')
+  system %(zsh -c 'source ${ZDOTDIR:-~}/.antidote/antidote.zsh; antidote update; antidote bundle <$HOME/.zsh/plugins/plugins.txt >$HOME/.zsh/plugins.zsh')
 end
 
 def setup_autohosts

config/Asdffile

@@ -32,6 +32,8 @@ plugin tfupdate
 plugin yarn
 version direnv latest
 version helm latest
+version python latest
+version python 3.12.1 # When updating this version mach it with the version in exports.zsh
 # version ruby latest
 version nodejs latest
 version yarn latest

zprofile

@@ -29,7 +29,7 @@ case $OSTYPE in
 darwin*)
   COREUTILS_PATH=$BREW_PREFIX/opt/coreutils/libexec/gnubin
   PATH=$COREUTILS_PATH:$PATH
-  [ -x /opt/homebrew/bin/brew ] && eval "$(/opt/homebrew/bin/brew shellenv)"
+  [ -x $BREW_PREFIX/bin/brew ] && eval "$($BREW_PREFIX/bin/brew shellenv)"
   export ARCHFLAGS="-arch x86_64"
   ;;
 *) ;;

zsh/aliases.zsh

@@ -37,7 +37,6 @@ alias gtts="gt trunk && gt sync"
 alias gtt="gt trunk"
 alias gts="gt sync"
 alias gcl="GIT_TEMPLATE_DIR=$HOME/.git_template g cl"
-alias j="z"
 
 alias time='gtime -f '\''%Us user %Ss system %es real %MkB mem -- %C'\'
 

zsh/exports.zsh

@@ -11,9 +11,9 @@ export VISUAL=code
 
 export COMPOSE_DOCKER_CLI_BUILD=1
 export DOCKER_BUILDKIT=1
-export CLOUDSDK_PYTHON=$(asdf where python 3.12.1)/bin/python
+export CLOUDSDK_PYTHON=$(asdf where python 3.12.1)/bin/python # When updating this version mach it with the version in Asdffile
 
-export FZF_BASE=/usr/local/opt/fzf
+# export FZF_BASE=/usr/local/opt/fzf
 export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow -g "!{.git,node_modules}/*" 2> /dev/null'
 export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
 

zsh/tools.zsh

@@ -33,7 +33,7 @@ if type zoxide >/dev/null; then
   eval "$(zoxide init zsh --cmd j)"
 fi
 
-if [ -d "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/" ]; then
-  source "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc"
-  source "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc"
+if [ -d "$BREW_PREFIX/share/google-cloud-sdk" ]; then
+  source "$BREW_PREFIX/share/google-cloud-sdk/path.zsh.inc"
+  source "$BREW_PREFIX/share/google-cloud-sdk/completion.zsh.inc"
 fi

zshenv

@@ -12,7 +12,11 @@
 
 export SYSTEM=$(uname -s)
 export ZHISTFILE=.histfile
-export BREW_PREFIX=/usr/local
+if [[ -n $(whence -p brew) ]]; then
+  export BREW_PREFIX=$(brew --prefix)
+else
+  export BREW_PREFIX=/opt/homebrew
+fi
 
 # https://github.com/sorin-ionescu/prezto/blob/master/runcoms/zshenv
 # Ensure that a non-login, non-interactive shell has a defined environment.