Drop support for vim, cleanup nvim config

[rbdr/dotfiles] / zsh / modules / prompt.zsh

diff --git a/zsh/modules/prompt.zsh b/zsh/modules/prompt.zsh
index 2b7454d140f3d43a0195f1193a2278947b420cf0..beeb85d720a3c8e7b298857161d72ce86e4d03fa 100644 (file)
--- a/zsh/modules/prompt.zsh
+++ b/zsh/modules/prompt.zsh
@@ -1,5 +1,13 @@
 autoload -Uz promptinit && promptinit
 
 autoload -Uz promptinit && promptinit
 

+function tool_versions() {
+  if [[ -s ".tool-versions" ]]; then
+       echo '.tool-versions'
+       return
+  fi
+  echo "${HOME}/.tool-versions"
+}
+

 if [[ "$TERM" == (dumb|linux|*bsd*) ]] || (( $#prompt_argv < 1 )); then
   prompt 'off'
 fi
 if [[ "$TERM" == (dumb|linux|*bsd*) ]] || (( $#prompt_argv < 1 )); then
   prompt 'off'
 fi


@@ -22,23 +30,22 @@ function env_info {
 }
 
 function python_info {
 }
 
 function python_info {

-  pythoninfo=`asdf current python | sed 's/  */ /g' | cut -d ' ' -f 2`
-  if [[ -z "$VIRTUAL_ENV" ]]; then
-    venv="default"
-  else
-    venv="${VIRTUAL_ENV##*/}"
-  fi
-  echo "%{%F{green}%}py%{%F{black}%} ${pythoninfo}@${venv}"
+  pythoninfo=`cat "$(tool_versions)" | rg python | cut -d ' ' -f 2`
+  pythoninfo=${ASDF_PYTHON_VERSION:-$pythoninfo}
+  venv="${VIRTUAL_ENV##*/}"
+  echo "%{%F{green}%}py%{%F{black}%} ${pythoninfo:-no}@${venv:-default}"

 }
 
 function ruby_info {
 }
 
 function ruby_info {

-  rubyinfo=`asdf current ruby | sed 's/  */ /g' | cut -d ' ' -f 2`
-  echo "%{%F{red}%}rb%{%F{black}%} ${rubyinfo}"
+  rubyinfo=`cat "$(tool_versions)" | rg ruby | cut -d ' ' -f 2`
+  rubyinfo=${ASDF_RUBY_VERSION:-$rubyinfo}
+  echo "%{%F{red}%}rb%{%F{black}%} ${rubyinfo:-no}"

 }
 
 function node_info {
 }
 
 function node_info {

-  nodeinfo=`asdf current nodejs | sed 's/  */ /g' | cut -d ' ' -f 2`
-  echo "%{%F{yellow}%}js%{%F{black}%} ${nodeinfo}"
+  nodeinfo=`cat "$(tool_versions)" | rg nodejs | cut -d ' ' -f 2`
+  nodeinfo=${ASDF_NODEJS_VERSION:-$nodeinfo}
+  echo "%{%F{yellow}%}js%{%F{black}%} ${nodeinfo:-no}"

 }
 
 function box_name {
 }
 
 function box_name {