From 0da7ce606e438e5662420f5fac382352e48ea9f0 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Fri, 14 Feb 2020 02:32:52 +0000
Subject: [PATCH] zshrc: Match fish prompt

---
 zshrc | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/zshrc b/zshrc
index 37671a6..47ca84e 100644
--- a/zshrc
+++ b/zshrc
@@ -67,12 +67,18 @@ case $TERM_PROGRAM in
 		;;
 esac
 
+__color() { print "%{\e[$1m%}" }
+__color_256() { __color "38;5;$1" }
+__reset_color() { __color 0 }
+
 set_prompt() {
-	PS1="%m:%c$@%B%(!.#.$)%b "
+	PS1="$(__color_256 23)%m "
+	PS1+="$(__color_256 29)%c"
+	PS1+="$@$(__color_256 36)%B%(!.#.>)$(__reset_color) "
 	PS2="%B>%b "
-	RPS1="%(1j.%{$(print "\e[1;33m")%}%j%{$(print "\e[0m")%}.)"
-	RPS1+="%(?..%(1j. .)%{$(print "\e[1;31m")%}%?%{$(print "\e[0m")%})"
-	RPS2="%(1_.%{$(print "\e[1;30m")%}(%_%)%{$(print "\e[0m")%}.)"
+	RPS1="%(1j.$(__color "1;33")%j$(__reset_color).)"
+	RPS1+="%(?..%(1j. .)$(__color "1;31")%?$(__reset_color))"
+	RPS2="%(1_.$(__color "1;30")(%_%)$(__reset_color).)"
 }
 set_prompt
 
@@ -82,9 +88,8 @@ __precmd() {
 	local branch_name=$(git symbolic-ref HEAD 2>/dev/null)
 	branch_name=${branch_name##refs/heads/}
 	if [ -n "$branch_name" -a "$branch_name" != master ]; then
-		local branch="%{$(print "\e[1;30m")%}("
-		branch+="%{$(print "\e[0;36m")%}$branch_name"
-		branch+="%{$(print "\e[1;30m")%})%{$(print "\e[0m")%}"
+		local branch="$(__color_256 36)($(__color_256 78)$branch_name"
+		branch+="$(__color_256 36))"
 	fi
 	set_prompt $branch
 }