zsh/env

@@ -2,30 +2,30 @@
 # filename:     /zsh/env
 #--------------------------------
 
+# set default editor
+export EDITOR="nano"
+
+# set `ll` command - b(etter)ls per default
+alias ll=bls
+if [[ -x `which /usr/local/bin/exa` || -x `which /opt/homebrew/bin/exa` ]]; then
+    alias ll=exa
+fi
+if [[ -x `which /usr/local/bin/lsd` || -x `which /opt/homebrew/bin/lsd` ]]; then
+	alias ll=lsd
+fi
+
 # set language
 export LANGUAGE=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 export LC_TYPE=en_US.UTF-8
 
-# set default editor
-export EDITOR="nano"
-
-# set `ll` command - b(etter)ls per default
-alias ll=bls
-if test -f "$homebrew_path/exa"; then
-    alias ll=exa
-fi
-if test -f "$homebrew_path/lsd"; then
-	alias ll=lsd
-fi
-
 #
 # Path additions
 #
 
 if test -d "/opt/homebrew/"; then
-    export PATH="/opt/homebrew/bin:$PATH"
+    export PATH="/opt/homebrew/bin/:$PATH"
     eval "$(/opt/homebrew/bin/brew shellenv)"
 fi
 
@@ -60,12 +60,17 @@ if [[ $platform == 'macOS' ]]; then
     fi
 fi
 
-if test -d "$homebrew_opt/openjdk/bin/"; then
-    export PATH="$homebrew_opt/openjdk/bin:$PATH"
+if test -d "/opt/homebrew/opt/openjdk/bin"; then
+        export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
+fi
+if test -d "/usr/local/opt/java/bin/"; then
+        export PATH="/usr/local/opt/java/bin/:$PATH"
 fi
 
-if test -d "$homebrew_opt/ruby"; then
-	export PATH="$homebrew_opt/ruby/bin:$PATH"
+/usr/local/opt/java/bin/
+
+if test -d "/usr/local/opt/ruby"; then
+	export PATH="/usr/local/opt/ruby/bin:$PATH"
 fi
 
 if test -d "/usr/local/sbin"; then

zshrc

@@ -19,8 +19,6 @@ if [[ $(uname) == 'Linux' ]]; then
 elif [[ $(uname) == 'Darwin' ]]; then
    platform='macOS'
 fi
-
-# Define CPU architecture
 arch='Unknown'
 if [[ $(uname -p) == 'arm' ]]; then
     arch="arm"
@@ -30,16 +28,6 @@ elif [[ $(uname -p) == 'x86_64' ]]; then
     arch="x86_64"
 fi
 
-# Homebrew
-homebrew_path=""
-if test -f "/opt/homebrew/bin/brew"; then
-    homebrew_path="/opt/homebrew/bin"
-    homebrew_opt="/opt/homebrew/opt"
-elif test -f "/usr/local/bin/brew"; then
-    homebrew_path="/usr/local/bin"
-    homebrew_opt="/usr/local/opt"
-fi
-
 # Load additional settings
 source $HOME/.dotfiles/zsh/env
 source $HOME/.dotfiles/zsh/alias