From 6b953c93384421aa483ebfd21b2cd9c8bd7793fe Mon Sep 17 00:00:00 2001
From: David Ibia <david.ibia@boxmarshall.com>
Date: Sun, 12 Jan 2025 20:32:56 +0100
Subject: [PATCH] fix(zshrc): change export of PYENV_ROOT to use absolute path
 feat(zshrc): add support for pyenv virtualenv init refactor(zshrc): move
 pyenv initialization to the end of the file

---
 .zshrc | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.zshrc b/.zshrc
index 13d62eb..32b470f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -163,11 +163,17 @@ fi
 
 
 # Curl Setup
-export LDFLAGS="-L/opt/homebrew/opt/curl/lib"
-export CPPFLAGS="-I/opt/homebrew/opt/curl/include"
+if [ -d "/opt/homebrew/opt/curl" ] ; then
+    export LDFLAGS="-L/opt/homebrew/opt/curl/lib"
+    export CPPFLAGS="-I/opt/homebrew/opt/curl/include"
+fi
 
-export ANDROID_HOME=$HOME/Library/Android/sdk
-export PATH=$PATH:$ANDROID_HOME/platform-tools
+
+# Android setup
+if [ -d "$HOME/Library/Android/sdk" ] ; then
+    export ANDROID_HOME=$HOME/Library/Android/sdk
+    export PATH=$PATH:$ANDROID_HOME/platform-tools
+fi
 
 if [ -d "$HOME/.local/bin" ] ; then
     PATH="$HOME/.local/bin:$PATH"
@@ -231,12 +237,10 @@ _fzf_complete_tmn() {
 }
 
 # Setup Flutter
+
+
 export PATH="$HOME/.pub-cache/bin:$PATH"
 
-# Setup FZF
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-
-
 export GEM_HOME=$HOME/.gem
 export PATH=$GEM_HOME/bin:$PATH
 export PATH=$HOME/flutter/bin:$PATH
@@ -259,11 +263,6 @@ PERL_MM_OPT="INSTALL_BASE=$HOME/perl5"; export PERL_MM_OPT;
 [[ -f ~/.fzf.zsh  ]] && source <(fzf --zsh)
 ## [/Completion]
 
-
-#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
-export SDKMAN_DIR="$HOME/.sdkman"
-[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
-
 # Init Starship
 export STARSHIP_CONFIG="$HOME/.config/starship.toml"
 eval "$(starship init zsh)"
@@ -273,10 +272,12 @@ fpath+=~/.zfunc
 autoload -Uz compinit && compinit
 
 # Pyenv Virtualenv init
-export PYENV_ROOT="$HOME/.pyenv" >> ~/.zshrc
+export PYENV_ROOT="$HOME/.pyenv"
 [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
 
 eval "$(pyenv init -)"
 eval "$(pyenv virtualenv-init -)"
 
-source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+if [ -d "/opt/homebrew/share/zsh-syntax-highlighting" ]; then
+    source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+fi