From 1e0ed37b7d5ab2785c0c7c34e64feda7072982ca Mon Sep 17 00:00:00 2001
From: Fabio Scotto di Santolo <fabio.scottodisantolo@gmail.com>
Date: Sun, 27 Sep 2020 10:54:49 +0200
Subject: [PATCH] Fix shell configuration for exec-path-from-shell

---
 .bashrc            | 15 +--------------
 .profile           |  1 -
 .profile.d/java.sh |  2 +-
 .zshenv            | 19 +++++++++++++++++++
 .zshrc.macos       | 26 +-------------------------
 5 files changed, 22 insertions(+), 41 deletions(-)
 create mode 100644 .zshenv

diff --git a/.bashrc b/.bashrc
index 353c420..ac03130 100644
--- a/.bashrc
+++ b/.bashrc
@@ -144,20 +144,7 @@ function welcome() {
   echo -en "Local IP Address : "; my_ip | awk '{print $2}'
   echo "";
 }
-
-function appendpath() {
-  case ":$PATH:" in
-  *:"$1":*)
-  ;;
-  *)
-  PATH="${PATH:+$PATH:}$1"
-  esac
-}
-
-appendpath $HOME/.local/bin
-appendpath $HOME/go/bin
-unset appendpath
-
+ 
 [ -r $HOME/.bashrc.aliases ] && . $HOME/.bashrc.aliases
 
 # export QT_STYLE_OVERRIDE=gtk
diff --git a/.profile b/.profile
index c478d35..22c63a2 100644
--- a/.profile
+++ b/.profile
@@ -5,4 +5,3 @@ if test -d $HOME/.profile.d/; then
   done
   unset profile
 fi
-
diff --git a/.profile.d/java.sh b/.profile.d/java.sh
index 216c58a..3233f67 100644
--- a/.profile.d/java.sh
+++ b/.profile.d/java.sh
@@ -1 +1 @@
-export JAVA_HOME=$(/usr/libexec/java_home -v 11)
+export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)
diff --git a/.zshenv b/.zshenv
new file mode 100644
index 0000000..3176034
--- /dev/null
+++ b/.zshenv
@@ -0,0 +1,19 @@
+function appendpath() {
+  case ":$PATH:" in
+  *:"$1":*)
+  ;;
+  *)
+  PATH="${PATH:+$PATH:}$1"
+  esac
+}
+
+appendpath $GOPATH/bin
+appendpath $HOME/.local/bin
+appendpath $HOME/.cargo/bin
+unset appendpath
+
+source /usr/local/opt/git-extras/share/git-extras/git-extras-completion.zsh
+
+#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
+export SDKMAN_DIR="/Users/plague/.sdkman"
+[[ -s "/Users/plague/.sdkman/bin/sdkman-init.sh" ]] && source "/Users/plague/.sdkman/bin/sdkman-init.sh"
diff --git a/.zshrc.macos b/.zshrc.macos
index 9e598eb..26dd7c8 100644
--- a/.zshrc.macos
+++ b/.zshrc.macos
@@ -8,7 +8,7 @@ export ZSH="/Users/plague/.oh-my-zsh"
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="robbyrussell"
+ZSH_THEME="norm"
 
 # Set list of themes to pick from when loading at random
 # Setting this variable when ZSH_THEME=random will cause zsh to load
@@ -92,9 +92,7 @@ plugins=(
   kubectl
   lein 
   man 
-  microk8s
   minikube
-  mix 
   mvn 
   nmap 
   node
@@ -146,25 +144,3 @@ source $ZSH/oh-my-zsh.sh
 bindkey -e
 
 autoload -U compinit && compinit
-
-function appendpath() {
-  case ":$PATH:" in
-  *:"$1":*)
-  ;;
-  *)
-  PATH="${PATH:+$PATH:}$1"
-  esac
-}
-
-appendpath $GOPATH/bin
-appendpath $HOME/.local/bin
-appendpath $HOME/.cargo/bin
-unset appendpath
-
-source /usr/local/opt/git-extras/share/git-extras/git-extras-completion.zsh
-#neofetch --color_blocks off
-
-#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
-export SDKMAN_DIR="/Users/plague/.sdkman"
-[[ -s "/Users/plague/.sdkman/bin/sdkman-init.sh" ]] && source "/Users/plague/.sdkman/bin/sdkman-init.sh"
-