Add linux compatibility fixes

[rbdr/dotfiles] / runcoms / zshrc

diff --git a/runcoms/zshrc b/runcoms/zshrc
index 189c40d48b2b0137d94f6d3c5de8fa6770b276db..780b5264446548cb5099f05491901ca28612678c 100644 (file)
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -5,6 +5,7 @@ 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/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"

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


@@ -44,15 +45,18 @@ export VISUAL="vim"
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 export WORKON_HOME=$HOME/.virtualenvs
 export PROJECT_HOME=$HOME/Projects
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 export WORKON_HOME=$HOME/.virtualenvs
 export PROJECT_HOME=$HOME/Projects

-export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python"
+export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3"

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

-export FZF_DEFAULT_COMMAND='/usr/local/bin/rg --color never --files --hidden -g \!.git'
+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_OPTS='--preview ''bat --style=numbers --color=always {} | head -500'''
 

+# Z
+. /usr/local/etc/profile.d/z.sh
+

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


@@ -61,4 +65,19 @@ if [[ -s "${ZDOTDIR:-$HOME}/.secrets.zsh" ]]; then
   source "${ZDOTDIR:-$HOME}/.secrets.zsh"
 fi
 
   source "${ZDOTDIR:-$HOME}/.secrets.zsh"
 fi
 

-eval $(/usr/libexec/path_helper -s)
+# Load a local config
+
+if [[ -s "${ZDOTDIR:-$HOME}/.zshrc.local" ]]; then
+  source "${ZDOTDIR:-$HOME}/.zshrc.local"
+fi
+
+if command -v brew &>  /dev/null; then
+  eval $(/usr/libexec/path_helper -s)
+fi
+
+# ASDF
+if ! command -v brew &>  /dev/null; then
+  . $HOME/.asdf/asdf.sh
+else
+  . $(brew --prefix asdf)/asdf.sh
+fi