]> Sergey Matveev's repositories - dotfiles.git/blobdiff - zsh/.zsh/rc/015prompt.zsh
Show only action and G-flag in Git-repository
[dotfiles.git] / zsh / .zsh / rc / 015prompt.zsh
index 3ffbab91d8b47120830fe74843207f75e7693564..95fbb18e40bbdcf2394368e32d89aa0441cc2673 100644 (file)
@@ -1,25 +1,29 @@
+setopt PROMPT_SUBST
+
+PS1="%2~ %B"
+PS1+='${(j::)psvar}'
+PS1+="%(1j.%j.)%b"
+PS1+='%U${vcs_info_msg_0_}%u'
+PS1+="%(?.. %S%?%s)"
+PS1+='%(1S. %B${SECONDS}%b.)'
+PS1+='%B%F{magenta}${_VIMODE}%f%b '
+
 function zle-line-init zle-keymap-select {
-    prompt="%2~ %B"
-    [[ "$#_autoenv_stack_entered" -gt 0 ]] && prompt+="A"
-    [[ -n "$VIRTUAL_ENV" ]] && prompt+="V"
-    prompt+="%(1j.%j.)%b"
-    prompt+="%U${vcs_info_msg_0_[1,-32]}%u"
-    prompt+="%(?..%S%?%s)"
-    [[ $timer ]] && {
-        local val=$(( $SECONDS - $timer ))
-        [[ $val -gt 0 ]] && prompt+="%U${val}%u"
+    [[ ${KEYMAP} == vicmd ]] && _VIMODE="+" || _VIMODE="%#"
+    [[ "$#_autoenv_stack_entered" -eq 0 ]] && psvar=(${psvar#A}) || {
+        [[ -n "${psvar[(r)A]}" ]] || psvar=(A $psvar)
+    }
+    [[ -z "$VIRTUAL_ENV" ]] && psvar=(${psvar#V}) || {
+        [[ -n "${psvar[(r)V]}" ]] || psvar=(V $psvar)
     }
-    local state="%#"
-    [[ ${KEYMAP} == vicmd ]] && state="+"
-    prompt+="%B%F{magenta}${state}%f%b "
-    PS1=$prompt
     zle reset-prompt
 }
+
 zle -N zle-line-init
 zle -N zle-keymap-select
 
 preexec() {
-    timer=$SECONDS
+    SECONDS=0
 }
 
 precmd() {