Merge branch 'main' of git.sr.ht:~rbdr/dotfiles

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

diff --git a/zsh/modules/prompt.zsh b/zsh/modules/prompt.zsh
index a3051788869a112d3bdc88941f0dceb91aface45..615ca95749ec84c5f7bc3742261a5ae9b6df9519 100644 (file)
--- a/zsh/modules/prompt.zsh
+++ b/zsh/modules/prompt.zsh
@@ -4,43 +4,6 @@ if [[ "$TERM" == (dumb|linux|*bsd*) ]] || (( $#prompt_argv < 1 )); then
   prompt 'off'
 fi
 
-#
-# Precmd
-#
-
-function prompt_precmd {
-  git-info
-}
-
-#
-# Functions
-#
-
-function env_info_provider() { echo "%{%F{green}%}n/a"; }
-function env_info {
-  echo "[%{%F{cyan}%}ENV%{%F{black}%} $(env_info_provider)%{%F{black}%}]"
-}
-
-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 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 {
-    [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
-}
-
 #
 # ZLE widgets
 #
@@ -81,24 +44,11 @@ function prompt_setup {
   # Load required functions.
   autoload -Uz add-zsh-hook
 
-  # Add hook for calling git-info before each command.
-  add-zsh-hook precmd prompt_precmd
-
-  # Set git-info parameters.
-  zstyle ':git:info' verbose 'no'
-  zstyle ':git:info:branch' format '@%F{cyan}%b%f'
-  zstyle ':git:info:clean' format ''
-  zstyle ':git:info:added' format '%{%F{green}%}!'
-  zstyle ':git:info:modified' format '%{%F{green}%}?'
-  zstyle ':git:info:untracked' format '%{%F{magenta}%}?'
-  zstyle ':git:info:keys' format \
-    'prompt' '%b%a%m%u'
-
   # Define prompts.
   PROMPT='
-%{%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%} )$ '
+%{%F{black}%}$(env_info) $(node_info) $(rust_info) $(python_info)
+%{%F{magenta}%}%n%{%f%}@%{%F{yellow}%}$(hostname -s)%{%f%} %{%B%F{green}%}${PWD/#$HOME/~}%{%f%b%}$(git_info)%{%f%}
+%(?,,%{${%B%F{white}%}[%?]%{%f%b%} )%% '
 }
 
 prompt_setup "$@"