Update deps, fix for linux

[rbdr/dotfiles] / runcoms / zshrc

diff --git a/runcoms/zshrc b/runcoms/zshrc
index 18aee8e95fd70fff42808b96d6bd81fbd6e3cf4d..5d51c56124ce949aa03c6b82c22efdd198f6ca32 100644 (file)
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -1,11 +1,12 @@
 ################################################################################
 # Load Functions
 ################################################################################
 ################################################################################
 # Load Functions
 ################################################################################

-source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/git-info.zsh"

 source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/dotenv.zsh"
 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/dotenv.zsh"
 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/status.zsh"

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


@@ -23,39 +24,27 @@ 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
 
 # Paths
 # export JAVA_HOME=$(/usr/libexec/java_home) # Enable if using JDK, otherwise disable for performance

-export GOPATH=$HOME/Projects/go
-export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH
+export XDG_CONFIG_HOME=$HOME/.config
+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:/usr/local/opt/go/libexec/bin:${GOPATH//://bin:}/bin
+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:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_HOME:/Applications/calibre.app/Contents/MacOS
 

-# Editor.
-export EDITOR="vim"
-export VISUAL="vim"
-
-# Python related variables
-export VIRTUAL_ENV_DISABLE_PROMPT=1
-export WORKON_HOME=$HOME/.virtualenvs
-export PROJECT_HOME=$HOME/Projects
-export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3"
-

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

+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+[ -f /usr/share/doc/fzf/examples/key-bindings.zsh ] && source /usr/share/doc/fzf/examples/key-bindings.zsh
+[ -f /usr/share/doc/fzf/examples/completion.zsh ] && source /usr/share/doc/fzf/examples/completion.zsh
+

 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
-  export FZF_VIM_PATH=/usr/local/opt/fzf
-fi

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


@@ -71,22 +60,33 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zshrc.local" ]]; then
   source "${ZDOTDIR:-$HOME}/.zshrc.local"
 fi
 
   source "${ZDOTDIR:-$HOME}/.zshrc.local"
 fi
 

-eval $(/usr/libexec/path_helper -s)
-

 if [[ -s "/opt/homebrew/bin/brew" ]]; then
 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 ! command -v brew &>  /dev/null; then
-  . /usr/local/etc/profile.d/z.sh
-else
+  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
+  # Z (Linux)
+  if [[ -s "/usr/libexec/z.sh" ]]; then
+    . /usr/libexec/z.sh
+  else
+    if [[ -s "/usr/share/z/z.sh" ]]; then
+      . /usr/share/z/z.sh
+    else
+      . /usr/local/etc/profile.d/z.sh
+    fi
+  fi
+
+  # ASDF (Linux)
+  if [[ -s "/opt/asdf-vm/asdf.sh" ]]; then
+    . /opt/asdf-vm/asdf.sh
+  else
+    . $HOME/.asdf/asdf.sh
+  fi

 fi
 
 fi
 

-# ASDF
-if ! command -v brew &>  /dev/null; then
-  . $HOME/.asdf/asdf.sh
-else
-  . $(brew --prefix asdf)/asdf.sh
+# ASDF Java
+if [[ -s "~/.asdf/plugins/java/set-java-home.zsh" ]]; then
+  . ~/.asdf/plugins/java/set-java-home.zsh

 fi
 fi