Update for asdf 0.16

[rbdr/dotfiles] / runcoms / zshrc

diff --git a/runcoms/zshrc b/runcoms/zshrc
index 5d51c56124ce949aa03c6b82c22efdd198f6ca32..d0bf0c66287bb4e648f10b92c66ca5adbe4fc16a 100644 (file)
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -7,6 +7,9 @@ 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"
+source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/sync-repos.zsh"
+source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/check-repos.zsh"
+source "${ZDOTDIR:-$HOME}/.dotfiles/zsh/functions/ssh-key-helpers.zsh"
 
 ################################################################################
 # Load Modules
@@ -39,9 +42,7 @@ export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_NDK_
 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
+[ -x "$(command -v fzf)" ] && source <(fzf --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'''
@@ -77,16 +78,11 @@ 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
 
-# ASDF Java
+# ASDF
+export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"
+
 if [[ -s "~/.asdf/plugins/java/set-java-home.zsh" ]]; then
   . ~/.asdf/plugins/java/set-java-home.zsh
 fi