Add arch support, update X settings

[rbdr/dotfiles] / runcoms / zshrc

diff --git a/runcoms/zshrc b/runcoms/zshrc
index 272938ed72c358efa52471343b11f5d4ab6bb8fb..808616a00897ecd08f686679fc49f34178917cf7 100644 (file)
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -6,6 +6,7 @@ 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"
 
 ################################################################################
 # Load Modules
@@ -42,19 +43,27 @@ export VISUAL="nvim"
 # Python related variables
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 export WORKON_HOME=$HOME/.virtualenvs
-export PROJECT_HOME=$HOME/Projects
+export PROJECT_HOME=$HOME/Documents/projects
 export VIRTUALENVWRAPPER_PYTHON="/usr/local/bin/python3"
 
 # 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'''
 if [[ -s "/opt/homebrew/bin/brew" ]]; then
   export FZF_VIM_PATH=/opt/homebrew/opt/fzf
 else
-  export FZF_VIM_PATH=/usr/local/opt/fzf
+  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
 
 ################################################################################
@@ -71,22 +80,28 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zshrc.local" ]]; then
   source "${ZDOTDIR:-$HOME}/.zshrc.local"
 fi
 
-eval $(/usr/libexec/path_helper -s)
-
 if [[ -s "/opt/homebrew/bin/brew" ]]; then
   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
+if [[ -s "/opt/homebrew/bin/brew" ]]; then
   . /opt/homebrew/etc/profile.d/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
 if ! command -v brew &>  /dev/null; then
-  . $HOME/.asdf/asdf.sh
+  if [[ -s "/opt/asdf-vm/asdf.sh" ]]; then
+    . /opt/asdf-vm/asdf.sh
+  else
+    . $HOME/.asdf/asdf.sh
+  fi
 else
   . $(brew --prefix asdf)/asdf.sh
 fi