Adjust startup logic

[rbdr/dotfiles] / runcoms / zshrc

diff --git a/runcoms/zshrc b/runcoms/zshrc
index 3b61e08f874b01982ec385e0f8e15940ecfd6266..07d4269777b51fc72acb4f349705ebe317222ec8 100644 (file)
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -6,6 +6,7 @@ source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/graphviz.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/short-uptime.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/figlet-sample.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/prettify-json.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/short-uptime.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/figlet-sample.zsh"
 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/prettify-json.zsh"

+source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/status.zsh"

 
 ################################################################################
 # Load Modules
 
 ################################################################################
 # Load Modules


@@ -23,23 +24,17 @@ source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/modules/aliases.zsh"
 # ENV VARIABLES
 ################################################################################
 # Terminal related
 # ENV VARIABLES
 ################################################################################
 # Terminal related

-export TERM=xterm-256color-italic
+export TERM=xterm-256color

 
 # Paths
 # export JAVA_HOME=$(/usr/libexec/java_home) # Enable if using JDK, otherwise disable for performance
 export XDG_CONFIG_HOME=$HOME/.config
 
 # Paths
 # export JAVA_HOME=$(/usr/libexec/java_home) # Enable if using JDK, otherwise disable for performance
 export XDG_CONFIG_HOME=$HOME/.config

-export GOPATH=$HOME/Projects/go
+export GOPATH=$HOME/projects/go

 export ANDROID_HOME=$HOME/Library/Android/sdk
 export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk-bundle
 export ANDROID_HOME=$HOME/Library/Android/sdk
 export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk-bundle

-export NVM_DIR=$HOME/.nvm

 export PATH=$PATH:$HOME:${GOPATH//://bin:}/bin
 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:/Applications/calibre.app/Contents/MacOS
 
 export PATH=$PATH:$HOME:${GOPATH//://bin:}/bin
 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:/Applications/calibre.app/Contents/MacOS
 

-# Python related variables
-export VIRTUAL_ENV_DISABLE_PROMPT=1
-export WORKON_HOME=$HOME/.virtualenvs
-export PROJECT_HOME=$HOME/Documents/projects
-

 # GPG
 export GPG_TTY=$(tty)
 
 # GPG
 export GPG_TTY=$(tty)
 


@@ -50,15 +45,6 @@ export GPG_TTY=$(tty)
 
 export FZF_DEFAULT_COMMAND='/usr/bin/env rg --color never --files --hidden -g \!.git'
 export FZF_DEFAULT_OPTS='--preview ''bat --style=numbers --color=always {} | head -500'''
 
 export FZF_DEFAULT_COMMAND='/usr/bin/env rg --color never --files --hidden -g \!.git'
 export FZF_DEFAULT_OPTS='--preview ''bat --style=numbers --color=always {} | head -500'''

-if [[ -s "/opt/homebrew/bin/brew" ]]; then
-  export FZF_VIM_PATH=/opt/homebrew/opt/fzf
-else
-  if [[ -s "/usr/local/bin/brew" ]]; then
-    export FZF_VIM_PATH=/usr/local/opt/fzf
-  else
-    export FZF_VIM_PATH=/usr/share/doc/fzf/examples
-  fi
-fi

 
 ################################################################################
 # SECRET ENV VARS!!
 
 ################################################################################
 # SECRET ENV VARS!!


@@ -75,13 +61,20 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zshrc.local" ]]; then
 fi
 
 if [[ -s "/opt/homebrew/bin/brew" ]]; then
 fi
 
 if [[ -s "/opt/homebrew/bin/brew" ]]; then

+  # Brew Setup

   export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:$PATH
   export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:$PATH

-fi
-
-# Z
-if [[ -s "/opt/homebrew/bin/brew" ]]; then
+  export FZF_VIM_PATH=/opt/homebrew/opt/fzf

   . /opt/homebrew/etc/profile.d/z.sh
   . /opt/homebrew/etc/profile.d/z.sh

+  . /opt/homebrew/opt/asdf/libexec/asdf.sh

 else
 else

+  # FZF Vim (Linux)
+  if [[ -s "/usr/local/bin/brew" ]]; then
+    export FZF_VIM_PATH=/usr/local/opt/fzf
+  else
+    export FZF_VIM_PATH=/usr/share/doc/fzf/examples
+  fi
+
+  # Z (Linux)

   if [[ -s "/usr/libexec/z.sh" ]]; then
     . /usr/libexec/z.sh
   else
   if [[ -s "/usr/libexec/z.sh" ]]; then
     . /usr/libexec/z.sh
   else


@@ -91,19 +84,16 @@ else
       . /usr/local/etc/profile.d/z.sh
     fi
   fi
       . /usr/local/etc/profile.d/z.sh
     fi
   fi

-fi

 
 

-# ASDF
-if ! command -v brew &>  /dev/null; then
+  # ASDF (Linux)

   if [[ -s "/opt/asdf-vm/asdf.sh" ]]; then
     . /opt/asdf-vm/asdf.sh
   else
     . $HOME/.asdf/asdf.sh
   fi
   if [[ -s "/opt/asdf-vm/asdf.sh" ]]; then
     . /opt/asdf-vm/asdf.sh
   else
     . $HOME/.asdf/asdf.sh
   fi

-else
-  . $(brew --prefix asdf)/libexec/asdf.sh

 fi
 
 fi
 

+# ASDF Java

 if [[ -s "~/.asdf/plugins/java/set-java-home.zsh" ]]; then
   . ~/.asdf/plugins/java/set-java-home.zsh
 fi
 if [[ -s "~/.asdf/plugins/java/set-java-home.zsh" ]]; then
   . ~/.asdf/plugins/java/set-java-home.zsh
 fi