X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=e51ebfd8803f05ee94a3c16c862486c66e4b9586;hb=155bbb0527b3c34d606912c4123c376d04ab7a9b;hp=3db835308e47d919cdbacc722de3f8f1504086cf;hpb=97382727d96f1f4fdf2ee561be6783f405bb4a69;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 3db8353..e51ebfd 100644 --- a/zsh/rc +++ b/zsh/rc @@ -138,7 +138,7 @@ local default="%{${fg[default]}%}" # The prompt is in green and blue to make easily detectable, the error exit # code in red and bold and the job count in yellow. PROMPT="$green%B%m%b$default:$blue%B%~%b$default \ -%(1j.$yellow%j$default.)%(2L.+.)%# \ +%(1j.$yellow%j$default.)%# \ %(?..($red%B%?%b$default%) )" # VCS_Info was added in 4.3.9 but it works in earlier versions too. So load it @@ -160,13 +160,25 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || autoload -Uz vcs_info # Only look for git and mercurial repositories; the only I use. zstyle ':vcs_info:*' enable git hg + # Check the repository for changes so they can be used in %u/%c (see + # below). This comes with a speed penalty for bigger repositories. + zstyle ':vcs_info:*' check-for-changes true + # Set style of VCS_info display. The current branch (green) and VCS (blue) # is displayed. If there is an special action going on (merge, rebase) # it's also displayed (red). zstyle ':vcs_info:*' formats \ - "($green%b$default:$blue%s$default)" + "($green%b%u%c$default:$blue%s$default)" zstyle ':vcs_info:*' actionformats \ "($green%b$default/$red%a$default:$blue%s$default)" + # Set style for formats/actionformats when unstaged (%u) and staged (%c) + # changes are detected in the repository; check-for-changes must be set to + # true for this to work. Thanks to Bart Trojanowski + # (http://jukie.net/~bart/blog/pimping-out-zsh-prompt) for the idea + # (2010-03-11 00:20). + zstyle ':vcs_info:*' unstagedstr '¹' + zstyle ':vcs_info:*' stagedstr '²' + # Call VCS_info as precmd before every prompt. prompt_precmd() { vcs_info