From dc6da63645b68a3e41e8d87e2ea85bd4c71e0553 Mon Sep 17 00:00:00 2001
From: Fabian Ising <fabian.ising@sit.fraunhofer.de>
Date: Mon, 17 Jul 2023 11:13:07 +0200
Subject: [PATCH] [zsh] More m1 improvements

---
 zsh/.mac_config.example | 9 ++++++++-
 zsh/.zshrc              | 9 ---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/zsh/.mac_config.example b/zsh/.mac_config.example
index 6b3951b..d4930f8 100644
--- a/zsh/.mac_config.example
+++ b/zsh/.mac_config.example
@@ -4,7 +4,14 @@ export JAVA_HOME=`/usr/libexec/java_home`
 
 # Set path to work with pycharm ...
 # [[ "$PATH" =~ /usr/local/bin ]] || export PATH=$PATH:/usr/local/bin
-export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH:/usr/local/sbin"
+
+ARCH=`uname -m`
+if [[ $ARCH == "arm64" ]]; then
+    HOMEBREWPREFIX="/opt/homebrew"
+else
+    HOMEBREWPREFIX="/usr/local"
+fi
+export PATH="$HOMEBREWPREFIX/opt/coreutils/libexec/gnubin:$HOME/.local/bin:$HOMEBREWPREFIX/bin:$PATH:$HOMEBREWPREFIX/sbin"
 
 # test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index dd0327a..81cb84d 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -2,15 +2,6 @@
 # Initialization code that may require console input (password prompts, [y/n]
 # confirmations, etc.) must go above this block; everything else may go below.
 
-ARCH=`uname -m`
-if [[ $ARCH == "arm64" ]]; then
-    PREFIX="/opt/homebrew"
-else
-    PREFIX="/usr/local"
-fi
-
-export PATH="$HOME/.local/bin:$PREFIX/bin:$PATH"
-
 [[ -f ~/.zsh/.powerline_config ]] && source ~/.zsh/.powerline_config
 [[ -f ~/.zsh/.user_config ]] && source ~/.zsh/.user_config
 [[ -f ~/.zsh/.virtual_env_config.zsh ]] && source ~/.zsh/.virtual_env_config.zsh