From 78f6aac440e2d790e5a890b798a452b97ffd89d9 Mon Sep 17 00:00:00 2001
From: carlcarl <carlcarlking@gmail.com>
Date: Sun, 6 May 2012 18:25:55 +0800
Subject: [PATCH 1/7] Add my theme: carlcarl.zsh-theme

---
 themes/carlcarl.zsh-theme | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 themes/carlcarl.zsh-theme

diff --git a/themes/carlcarl.zsh-theme b/themes/carlcarl.zsh-theme
new file mode 100644
index 000000000..16edeaaa1
--- /dev/null
+++ b/themes/carlcarl.zsh-theme
@@ -0,0 +1,35 @@
+#!/usr/bin/env zsh
+#local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
+
+setopt promptsubst
+
+autoload -U add-zsh-hook
+
+HOST_PROMPT_="%{$fg_bold[magenta]%}@$HOST "
+
+PROMPT_SUCCESS_COLOR=$FG[077]
+PROMPT_FAILURE_COLOR=$FG[124]
+PROMPT_VCS_INFO_COLOR=$FG[242]
+PROMPT_PROMPT=$FG[077]
+GIT_DIRTY_COLOR=$fg_bold[magenta]
+GIT_CLEAN_COLOR=$FG[118]
+GIT_PROMPT_INFO=$fg_bold[magenta]
+
+PROMPT='$HOST_PROMPT_%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}➭%{$reset_color%} '
+
+RPROMPT='[%*]'
+#RPS1="${return_code}"
+
+ZSH_THEME_GIT_PROMPT_PREFIX="("
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%})"
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
+
+ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[082]%}✚%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[166]%}✹%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[160]%}✖%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[220]%}➜%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$FG[082]%}═%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$FG[190]%}✭%{$reset_color%}"
+
+

From 73ac7c28c4e284b5eae1bf9ed516f945ca76c816 Mon Sep 17 00:00:00 2001
From: carlcarl <carlcarlking@gmail.com>
Date: Thu, 17 May 2012 01:00:02 +0800
Subject: [PATCH 2/7] Use my own color instead of 'magenta'

---
 themes/carlcarl.zsh-theme | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/carlcarl.zsh-theme b/themes/carlcarl.zsh-theme
index 16edeaaa1..5adae834d 100644
--- a/themes/carlcarl.zsh-theme
+++ b/themes/carlcarl.zsh-theme
@@ -5,17 +5,17 @@ setopt promptsubst
 
 autoload -U add-zsh-hook
 
-HOST_PROMPT_="%{$fg_bold[magenta]%}@$HOST "
+HOST_PROMPT_="%B%{$FG[197]%}@$HOST %b"
 
 PROMPT_SUCCESS_COLOR=$FG[077]
 PROMPT_FAILURE_COLOR=$FG[124]
 PROMPT_VCS_INFO_COLOR=$FG[242]
 PROMPT_PROMPT=$FG[077]
-GIT_DIRTY_COLOR=$fg_bold[magenta]
+GIT_DIRTY_COLOR=$FG[197]
 GIT_CLEAN_COLOR=$FG[118]
-GIT_PROMPT_INFO=$fg_bold[magenta]
+GIT_PROMPT_INFO=$FG[197]
 
-PROMPT='$HOST_PROMPT_%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status) %{$reset_color%}%{$PROMPT_PROMPT%}➭%{$reset_color%} '
+PROMPT='$HOST_PROMPT_%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %B%{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status)%b %{$reset_color%}%{$PROMPT_PROMPT%}➭%{$reset_color%} '
 
 RPROMPT='[%*]'
 #RPS1="${return_code}"

From 57d01841ba101e66dcebc918af24ff9e49a4b07c Mon Sep 17 00:00:00 2001
From: carlcarl <carlcarlking@gmail.com>
Date: Thu, 28 Jun 2012 22:29:10 +0800
Subject: [PATCH 3/7] Modify style

---
 themes/carlcarl.zsh-theme | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/carlcarl.zsh-theme b/themes/carlcarl.zsh-theme
index 5adae834d..b67864255 100644
--- a/themes/carlcarl.zsh-theme
+++ b/themes/carlcarl.zsh-theme
@@ -5,17 +5,17 @@ setopt promptsubst
 
 autoload -U add-zsh-hook
 
-HOST_PROMPT_="%B%{$FG[197]%}@$HOST %b"
+HOST_PROMPT_="%B%{$FG[161]%}@$HOST %b"
 
 PROMPT_SUCCESS_COLOR=$FG[077]
 PROMPT_FAILURE_COLOR=$FG[124]
 PROMPT_VCS_INFO_COLOR=$FG[242]
 PROMPT_PROMPT=$FG[077]
-GIT_DIRTY_COLOR=$FG[197]
+GIT_DIRTY_COLOR=$FG[161]
 GIT_CLEAN_COLOR=$FG[118]
-GIT_PROMPT_INFO=$FG[197]
+GIT_PROMPT_INFO=$FG[161]
 
-PROMPT='$HOST_PROMPT_%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %B%{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status)%b %{$reset_color%}%{$PROMPT_PROMPT%}➭%{$reset_color%} '
+PROMPT='$HOST_PROMPT_%B%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %B%{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status)%b %{$reset_color%}%{$PROMPT_PROMPT%}➭%{$reset_color%} '
 
 RPROMPT='[%*]'
 #RPS1="${return_code}"

From 987b71224b45874cdd81ed13b4e2cd1e12f3f243 Mon Sep 17 00:00:00 2001
From: carlcarl <carlcarlking@gmail.com>
Date: Sat, 15 Sep 2012 00:16:05 +0800
Subject: [PATCH 4/7] update carlcarl theme

---
 themes/carlcarl.zsh-theme | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/carlcarl.zsh-theme b/themes/carlcarl.zsh-theme
index b67864255..9ce9c5922 100644
--- a/themes/carlcarl.zsh-theme
+++ b/themes/carlcarl.zsh-theme
@@ -17,7 +17,7 @@ GIT_PROMPT_INFO=$FG[161]
 
 PROMPT='$HOST_PROMPT_%B%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %B%{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status)%b %{$reset_color%}%{$PROMPT_PROMPT%}➭%{$reset_color%} '
 
-RPROMPT='[%*]'
+RPROMPT='[%*][%D{%Y-%m-%d}]'
 #RPS1="${return_code}"
 
 ZSH_THEME_GIT_PROMPT_PREFIX="("

From 03b59529187e1753122b06db1a1f34ac14368edc Mon Sep 17 00:00:00 2001
From: carlcarl <carlcarlking@gmail.com>
Date: Sun, 16 Sep 2012 20:56:34 +0800
Subject: [PATCH 5/7] Add powerline theme

---
 themes/powerline.zsh-theme | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 themes/powerline.zsh-theme

diff --git a/themes/powerline.zsh-theme b/themes/powerline.zsh-theme
new file mode 100644
index 000000000..6ebdd1a33
--- /dev/null
+++ b/themes/powerline.zsh-theme
@@ -0,0 +1,38 @@
+# FreeAgent puts the powerline style in zsh !
+
+if [ "$POWERLINE_RIGHT_B" = "" ]; then
+  POWERLINE_RIGHT_B=%D{%H:%M:%S}
+fi
+
+if [ "$POWERLINE_RIGHT_A" = "" ]; then
+  POWERLINE_RIGHT_A=%D{%Y-%m-%d}
+fi
+
+POWERLINE_COLOR_BG_GRAY=%K{240}
+POWERLINE_COLOR_BG_LIGHT_GRAY=%K{240}
+POWERLINE_COLOR_BG_WHITE=%K{255}
+
+POWERLINE_COLOR_FG_GRAY=%F{240}
+POWERLINE_COLOR_FG_LIGHT_GRAY=%F{240}
+POWERLINE_COLOR_FG_WHITE=%F{255}
+
+GIT_DIRTY_COLOR=%F{133}
+GIT_CLEAN_COLOR=%F{118}
+GIT_PROMPT_INFO=%F{012}
+
+ZSH_THEME_GIT_PROMPT_PREFIX=" \u2b60 "
+ZSH_THEME_GIT_PROMPT_SUFFIX="$GIT_PROMPT_INFO"
+ZSH_THEME_GIT_PROMPT_DIRTY=" $GIT_DIRTY_COLOR✘"
+ZSH_THEME_GIT_PROMPT_CLEAN=" $GIT_CLEAN_COLOR✔"
+
+ZSH_THEME_GIT_PROMPT_ADDED="%F{082}✚%f"
+ZSH_THEME_GIT_PROMPT_MODIFIED="%F{166}✹%f"
+ZSH_THEME_GIT_PROMPT_DELETED="%F{160}✖%f"
+ZSH_THEME_GIT_PROMPT_RENAMED="%F{220]➜%f"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%F{082]═%f"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{190]✭%f"
+
+PROMPT="
+%K{green}%F{black} %n %k%f%F{green}%K{blue}"$'\u2b80'"%k%f%F{white}%K{blue} %1~"$'$(git_prompt_info)'" %k%f%F{blue}"$'\u2b80'"%f "
+
+RPROMPT=$POWERLINE_COLOR_FG_WHITE$'\u2b82'"%f$POWERLINE_COLOR_BG_WHITE $POWERLINE_COLOR_FG_GRAY$POWERLINE_RIGHT_B "$'\u2b82'"%f%k$POWERLINE_COLOR_BG_GRAY$POWERLINE_COLOR_FG_WHITE $POWERLINE_RIGHT_A %f%k"

From bc64616b6312218fc4437c36c86e2ebaa320fe6f Mon Sep 17 00:00:00 2001
From: carlcarl <carlcarlking@gmail.com>
Date: Fri, 23 Nov 2012 23:32:21 +0800
Subject: [PATCH 6/7] Use light color

---
 themes/carlcarl.zsh-theme | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/carlcarl.zsh-theme b/themes/carlcarl.zsh-theme
index 9ce9c5922..7cf5645a8 100644
--- a/themes/carlcarl.zsh-theme
+++ b/themes/carlcarl.zsh-theme
@@ -5,17 +5,17 @@ setopt promptsubst
 
 autoload -U add-zsh-hook
 
-HOST_PROMPT_="%B%{$FG[161]%}@$HOST %b"
+HOST_PROMPT_="%B%{$FG[197]%}@$HOST %b"
 
 PROMPT_SUCCESS_COLOR=$FG[077]
 PROMPT_FAILURE_COLOR=$FG[124]
 PROMPT_VCS_INFO_COLOR=$FG[242]
 PROMPT_PROMPT=$FG[077]
-GIT_DIRTY_COLOR=$FG[161]
+GIT_DIRTY_COLOR=$FG[197]
 GIT_CLEAN_COLOR=$FG[118]
-GIT_PROMPT_INFO=$FG[161]
+GIT_PROMPT_INFO=$FG[197]
 
-PROMPT='$HOST_PROMPT_%B%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %B%{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status)%b %{$reset_color%}%{$PROMPT_PROMPT%}➭%{$reset_color%} '
+PROMPT='$HOST_PROMPT_%B%{$PROMPT_SUCCESS_COLOR%}%~%{$reset_color%} %B%{$GIT_PROMPT_INFO%}$(git_prompt_info)%{$GIT_DIRTY_COLOR%}$(git_prompt_status)%b %{$reset_color%}%{$PROMPT_PROMPT%}➭ %{$reset_color%} '
 
 RPROMPT='[%*][%D{%Y-%m-%d}]'
 #RPS1="${return_code}"

From 822977be20c7c1e0202b5b85ca2be39ee18cbdae Mon Sep 17 00:00:00 2001
From: carlcarl <carlcarlking@gmail.com>
Date: Tue, 19 Feb 2013 13:19:08 +0800
Subject: [PATCH 7/7] Update theme

---
 themes/powerline.zsh-theme | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/themes/powerline.zsh-theme b/themes/powerline.zsh-theme
index 6ebdd1a33..309750715 100644
--- a/themes/powerline.zsh-theme
+++ b/themes/powerline.zsh-theme
@@ -32,7 +32,6 @@ ZSH_THEME_GIT_PROMPT_RENAMED="%F{220]➜%f"
 ZSH_THEME_GIT_PROMPT_UNMERGED="%F{082]═%f"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%F{190]✭%f"
 
-PROMPT="
-%K{green}%F{black} %n %k%f%F{green}%K{blue}"$'\u2b80'"%k%f%F{white}%K{blue} %1~"$'$(git_prompt_info)'" %k%f%F{blue}"$'\u2b80'"%f "
+PROMPT="%K{237}%F{250} %n %k%f%F{244}%K{237}"$'\u2b81'"%k%f%F{250}%K{237} %1~"$'$(git_prompt_info)'" %k%f%F{237}%K{236}"$'\u2b80'" %k%f%F{244}%K{236} $  %k%f%F{236}"$'\u2b80'"%f "
 
 RPROMPT=$POWERLINE_COLOR_FG_WHITE$'\u2b82'"%f$POWERLINE_COLOR_BG_WHITE $POWERLINE_COLOR_FG_GRAY$POWERLINE_RIGHT_B "$'\u2b82'"%f%k$POWERLINE_COLOR_BG_GRAY$POWERLINE_COLOR_FG_WHITE $POWERLINE_RIGHT_A %f%k"