Simplify prompt functions

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

diff --git a/zsh/modules/prompt.zsh b/zsh/modules/prompt.zsh
index b21a41f8c963c620dcea4a3c4f20760071947401..a3051788869a112d3bdc88941f0dceb91aface45 100644 (file)
--- a/zsh/modules/prompt.zsh
+++ b/zsh/modules/prompt.zsh
@@ -16,31 +16,25 @@ function prompt_precmd {
 # Functions
 #
 
-function virtualenv_info {
-  if [[ -z "$VIRTUAL_ENV" ]]; then
-    venv="default"
-  else
-    venv="${VIRTUAL_ENV##*/}"
-  fi
-  echo "🐍 ${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 "💎 ${rvminfo}"
+function python_info {
+  pythoninfo=`cat ~/.tool-versions | rg python | cut -d ' ' -f 2`
+  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 "💛 ${nvminfo}"
+function ruby_info {
+  rubyinfo=`cat ~/.tool-versions | rg ruby | cut -d ' ' -f 2`
+  echo "%{%F{red}%}rb%{%F{black}%} ${rubyinfo:-no}"
+}
+
+function node_info {
+  nodeinfo=`cat ~/.tool-versions | rg nodejs | cut -d ' ' -f 2`
+  echo "%{%F{yellow}%}js%{%F{black}%} ${nodeinfo:-no}"
 }
 
 function box_name {
@@ -56,13 +50,9 @@ function zle-line-init zle-keymap-select {
     # Couldn't figure out how to get tmux and iTerm to agree on how to render
     # these characters... so there you go.
 
-    local normal_symbol="🅽"
-    local insert_symbol="🅸"
-    local error_symbol="🆇"
-
-    [ ! -z "$TMUX" ] && normal_symbol="%{$normal_symbol%2G%}"
-    [ ! -z "$TMUX" ] && insert_symbol="%{$insert_symbol%2G%}"
-    [ ! -z "$TMUX" ] && error_symbol="%{$error_symbol%2G%}"
+    local normal_symbol="N"
+    local insert_symbol="I"
+    local error_symbol="X"
 
     # Show vi status / return status on the right side
 
@@ -106,7 +96,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%} )$ '
 }