From 60b52ffc2935dcfe5ccf45b1e8113d1d802c46e0 Mon Sep 17 00:00:00 2001
From: Joe Groocock <me@frebib.net>
Date: Wed, 31 Oct 2018 21:48:57 +0000
Subject: [PATCH] zsh: recolour/restyle git-rprompt

---
 .config/zsh/plugins/git-rprompt.zsh | 55 ++++++++++++++++-------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/.config/zsh/plugins/git-rprompt.zsh b/.config/zsh/plugins/git-rprompt.zsh
index 47a544c..4f6b52d 100644
--- a/.config/zsh/plugins/git-rprompt.zsh
+++ b/.config/zsh/plugins/git-rprompt.zsh
@@ -1,52 +1,55 @@
 # ZSH RPROMPT containing simple Git status
 
 git_prompt_info() {
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-  echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX"
+    ref=$(git symbolic-ref HEAD 2> /dev/null) || return
+    echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$ZSH_THEME_GIT_PROMPT_SUFFIX"
 }
 git_prompt_status() {
     # Get the status of the working tree
     INDEX=$(command git status --porcelain -b 2> /dev/null)
+    RESET='%f'
     STATUS=""
     if $(echo "$INDEX" | grep -E '^\?\? ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$RESET$STATUS"
     fi
     if $(echo "$INDEX" | grep '^A  ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$RESET$STATUS"
     elif $(echo "$INDEX" | grep '^M  ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$RESET$STATUS"
     fi
     if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$RESET$STATUS"
     elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$RESET$STATUS"
     elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$RESET$STATUS"
     fi
     if $(echo "$INDEX" | grep '^R  ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$RESET$STATUS"
     fi
     if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$RESET$STATUS"
     elif $(echo "$INDEX" | grep '^D  ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$RESET$STATUS"
     elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$RESET$STATUS"
     fi
     if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$RESET$STATUS"
     fi
     if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$RESET$STATUS"
     fi
     if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
+        AHEAD=$(echo "$INDEX" | sed -nE 's/.*ahead\s([0-9]*).*/\1/p')
+        STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$AHEAD$RESET$STATUS"
     fi
     if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
+        BEHIND=$(echo "$INDEX" | sed -nE 's/.*behind\s([0-9]*).*/\1/p')
+        STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$BEHIND$RESET$STATUS"
     fi
     if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
-      STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
+        STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$RESET$STATUS"
     fi
     echo $STATUS
 }
@@ -54,16 +57,18 @@ git_prompt_status() {
 # Required for dynamic prompt
 setopt prompt_subst
 
-RPROMPT="$RPROMPT"'$(git_prompt_info)$(git_prompt_status)%{$reset_color%}'
-
 ZSH_THEME_GIT_PROMPT_PREFIX=" "
 ZSH_THEME_GIT_PROMPT_SUFFIX=""
 ZSH_THEME_GIT_PROMPT_DIRTY=""
 ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_AHEAD="%F{green}↑"
+ZSH_THEME_GIT_PROMPT_BEHIND="%F{red}↓"
 
-ZSH_THEME_GIT_PROMPT_ADDED="%{$fg_bold[green]%}+"
-ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg_bold[blue]%}!"
-ZSH_THEME_GIT_PROMPT_DELETED="%{$fg_bold[red]%}-"
-ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg_bold[magenta]%}>"
-ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg_bold[yellow]%}#"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[cyan]%}?"
+ZSH_THEME_GIT_PROMPT_ADDED="%F{green}+"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%F{blue}~"
+ZSH_THEME_GIT_PROMPT_DELETED="%F{red}-"
+ZSH_THEME_GIT_PROMPT_RENAMED="%F{magenta}>"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%F{yellow}#"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{cyan}?"
+
+RPROMPT="\$(git_prompt_info)\$(git_prompt_status)%{\$reset_color%}$RPROMPT"