Merge branch 'main' of gitlab.com:rbdr/dotfiles

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

diff --git a/zsh/modules/prompt.zsh b/zsh/modules/prompt.zsh
index 482bfc780ceba396f66281251455f24b9ff07f5f..0ab1e0d4aff6fdd7b74be73cdcc9dfc6ac7ce752 100644 (file)
--- a/zsh/modules/prompt.zsh
+++ b/zsh/modules/prompt.zsh
@@ -16,31 +16,28 @@ function prompt_precmd {
 # Functions
 #
 
-function virtualenv_info {
-  if [[ -z "$VIRTUAL_ENV" ]]; then
-    venv="default"
-  else
-    venv="${VIRTUAL_ENV##*/}"
-  fi
-  echo "%{%F{green}%}py%{%F{black}%} ${venv}"
+function env_info_provider() { echo "%{%F{green}%}n/a"; }
+function env_info {
+  echo "[%{%F{cyan}%}ENV%{%F{black}%} $(env_info_provider)%{%F{black}%}]"
 }
 
-function rvm_info {
-  if [[ -z "$RUBY_VERSION" ]]; then
-    rvminfo="default"
-  else
-    rvminfo=`rvm-prompt`
-  fi
-  echo "%{%F{red}%}rb%{%F{black}%} ${rvminfo}"
+function python_info {
+  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 nvm_info {
-  if [[ -z "$NVM_BIN" ]]; then
-    nvminfo="default"
-  else
-    nvminfo=`nvm current`
-  fi
-  echo "%{%F{yellow}%}js%{%F{black}%} ${nvminfo}"
+function ruby_info {
+  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 {
+  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 {
@@ -102,7 +99,7 @@ function prompt_setup {
 
   # Define prompts.
   PROMPT='
-%{%F{black}%}$(nvm_info) $(rvm_info) $(virtualenv_info)
+%{%F{black}%}$(env_info) $(node_info) $(ruby_info) $(python_info)
 %{%F{magenta}%}%n%{%f%}@%{%F{yellow}%}$(box_name)%{%f%} %{%B%F{green}%}${PWD/#$HOME/~}%{%f%b%}${git_info[prompt]} %{%f%}
 %(?,,%{${%B%F{white}%}[%?]%{%f%b%} )$ '
 }