Update dependencies

[rbdr/dotfiles] / runcoms / zshrc

diff --git a/runcoms/zshrc b/runcoms/zshrc
index ebf6bf12bf9b1ee665ca2006d2f81035698f2dff..1c4325e06b6b33bd7a29d410867f6100b4eec101 100644 (file)
--- a/runcoms/zshrc
+++ b/runcoms/zshrc
@@ -9,6 +9,7 @@ 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
@@ -65,7 +66,6 @@ if [[ -s "/opt/homebrew/bin/brew" ]]; then
   export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:$PATH
   export FZF_VIM_PATH=/opt/homebrew/opt/fzf
   . /opt/homebrew/etc/profile.d/z.sh
-  . /opt/homebrew/opt/asdf/libexec/asdf.sh
 else
   # Z (Linux)
   if [[ -s "/usr/libexec/z.sh" ]]; then
@@ -77,16 +77,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