Diff
1diff --git a/themes/arrow.zsh-theme b/themes/arrow.zsh-theme
2index a3e77d65d7f434c10faa79a19ad183834f589e57..76c031fd2162709fe3f22a7c6abe54995a544d57 100644
3--- a/themes/arrow.zsh-theme
4+++ b/themes/arrow.zsh-theme
5@@ -1,7 +1,7 @@
6 if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
7
8 PROMPT='%{$fg[$NCOLOR]%}%c ➤ %{$reset_color%}'
9-RPROMPT='%{$fg[$NCOLOR]%}%p $(git_prompt_info)%{$reset_color%}'
10+RPROMPT='%{$fg[$NCOLOR]%} $(git_prompt_info)%{$reset_color%}'
11
12 ZSH_THEME_GIT_PROMPT_PREFIX="git:"
13 ZSH_THEME_GIT_PROMPT_SUFFIX=""
14diff --git a/themes/awesomepanda.zsh-theme b/themes/awesomepanda.zsh-theme
15index 1c5d06b2de79c0998b8129d15b046aac7c014b9d..85036e4ace92b65617d4587e159b4121c1548508 100644
16--- a/themes/awesomepanda.zsh-theme
17+++ b/themes/awesomepanda.zsh-theme
18@@ -1,6 +1,6 @@
19 # the svn plugin has to be activated for this to work.
20 local ret_status="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ %s)"
21-PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}$(svn_prompt_info)%{$reset_color%}'
22+PROMPT='${ret_status}%{$fg_bold[green]%} %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}$(svn_prompt_info)%{$reset_color%}'
23
24 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
25 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
26diff --git a/themes/cloud.zsh-theme b/themes/cloud.zsh-theme
27index 59a3472b60cbdef64a4fd0151d961013724d40d1..e26f786e14744bfc3f004a2ffd77470ee9b535ac 100644
28--- a/themes/cloud.zsh-theme
29+++ b/themes/cloud.zsh-theme
30@@ -2,7 +2,7 @@ if [[ -z $ZSH_THEME_CLOUD_PREFIX ]]; then
31 ZSH_THEME_CLOUD_PREFIX='☁'
32 fi
33
34-PROMPT='%{$fg_bold[cyan]%}$ZSH_THEME_CLOUD_PREFIX %{$fg_bold[green]%}%p %{$fg[green]%}%c %{$fg_bold[cyan]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
35+PROMPT='%{$fg_bold[cyan]%}$ZSH_THEME_CLOUD_PREFIX %{$fg_bold[green]%} %{$fg[green]%}%c %{$fg_bold[cyan]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
36
37 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[%{$fg[cyan]%}"
38 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
39diff --git a/themes/edvardm.zsh-theme b/themes/edvardm.zsh-theme
40index f9ca1a9e2212cf5b3f8034a7255a408275d28d40..d41dd4434ce8482b23874268f91bc6b534931113 100644
41--- a/themes/edvardm.zsh-theme
42+++ b/themes/edvardm.zsh-theme
43@@ -1,4 +1,4 @@
44-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg_bold[white]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
45+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%} %{$fg_bold[white]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
46
47 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
48 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
49diff --git a/themes/fwalch.zsh-theme b/themes/fwalch.zsh-theme
50index 24edf55c01b73f6323ded39f1a9a9a49a4379fd5..33f851c9d292bd00a045e432775d0aa7b4cdaa5e 100644
51--- a/themes/fwalch.zsh-theme
52+++ b/themes/fwalch.zsh-theme
53@@ -1,4 +1,4 @@
54-PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
55+PROMPT='%{$fg_bold[green]%} %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
56
57 ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[red]%}"
58 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
59diff --git a/themes/gozilla.zsh-theme b/themes/gozilla.zsh-theme
60index c6b752e9b400f9ce2ff8942c937822e62306f164..593b8ec358de155e34d5c59813bd97798ec4c241 100644
61--- a/themes/gozilla.zsh-theme
62+++ b/themes/gozilla.zsh-theme
63@@ -1,4 +1,4 @@
64-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
65+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%} %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
66
67 ZSH_THEME_GIT_PROMPT_PREFIX="("
68 ZSH_THEME_GIT_PROMPT_SUFFIX=")"
69diff --git a/themes/jbergantine.zsh-theme b/themes/jbergantine.zsh-theme
70index d84247cffb2edd545a13c1484d5d840a1317a210..8e9a8ee959e2623b65d2cbfd7bcb43f92edfd992 100644
71--- a/themes/jbergantine.zsh-theme
72+++ b/themes/jbergantine.zsh-theme
73@@ -1,4 +1,4 @@
74-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[white]%}$(git_prompt_info)%{$fg_bold[white]%} % %{$reset_color%}'
75+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%} %{$fg[cyan]%}%c %{$fg_bold[white]%}$(git_prompt_info)%{$fg_bold[white]%} % %{$reset_color%}'
76
77 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
78 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
79diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme
80index bae88f7abc6269d4eea700a47d8cf270cdb1fa63..9d8fb2488a3fe32d95008059d7e47572f99acdcc 100644
81--- a/themes/jnrowe.zsh-theme
82+++ b/themes/jnrowe.zsh-theme
83@@ -33,6 +33,6 @@ function {
84
85 local ret_status="%(?:%{$fg_bold[green]%}Ξ:%{$fg_bold[red]%}%S↑%s%?)"
86
87-PROMPT='${ret_status}%{$fg[blue]%}${PROMPT_HOST}%{$fg_bold[green]%}%p %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} '
88+PROMPT='${ret_status}%{$fg[blue]%}${PROMPT_HOST}%{$fg_bold[green]%} %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} '
89
90 # vim: set ft=zsh ts=4 sw=4 et:
91diff --git a/themes/jtriley.zsh-theme b/themes/jtriley.zsh-theme
92index 15d77ed238446e3bdeb841a931d75863454425c3..0f5b16f0a8e125a6fdfd3d0e0a5b1b2c9490e8ef 100644
93--- a/themes/jtriley.zsh-theme
94+++ b/themes/jtriley.zsh-theme
95@@ -1,8 +1,2 @@
96-#PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
97 PROMPT="%{$fg_bold[cyan]%}%T%{$fg_bold[green]%} %{$fg_bold[white]%}%n%{$fg[magenta]%}@%{$fg_bold[white]%}%m %{$fg_bold[green]%}%d
98 %{$fg_bold[yellow]%}%% %{$reset_color%}"
99-
100-#ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
101-#ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
102-#ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
103-#ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
104diff --git a/themes/kafeitu.zsh-theme b/themes/kafeitu.zsh-theme
105index c4720b24d926f072ac86ffb94ab9028ef05690ee..af96f5e3879946db0a3140c86838b5c50de484ce 100644
106--- a/themes/kafeitu.zsh-theme
107+++ b/themes/kafeitu.zsh-theme
108@@ -1,4 +1,4 @@
109-PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n%{$fg[cyan]%}@%{$fg_bold[green]%}%m %{$fg_bold[green]%}%p %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
110+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%n%{$fg[cyan]%}@%{$fg_bold[green]%}%m %{$fg_bold[green]%} %{$fg[cyan]%}%~ %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
111
112 ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
113 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
114diff --git a/themes/linuxonly.zsh-theme b/themes/linuxonly.zsh-theme
115index f9e0aa07df89f0f7bc55999f7c9455a66c746cd6..2afae8fc39c04414ad358ba84d02cc17abdaf01b 100644
116--- a/themes/linuxonly.zsh-theme
117+++ b/themes/linuxonly.zsh-theme
118@@ -1,7 +1,6 @@
119-# vim: set ts=2 textwidth=0
120-
121 autoload -U add-zsh-hook
122 autoload -Uz vcs_info
123+
124 local c0=$(printf "\033[0m")
125 local c1=$(printf "\033[38;5;215m")
126 local c2=$(printf "\033[38;5;209m")
127@@ -13,7 +12,6 @@ local c7=$(printf "\033[38;5;149m")
128 local c8=$(printf "\033[38;5;126m")
129 local c9=$(printf "\033[38;5;162m")
130
131-
132 if [ "$TERM" = "linux" ]; then
133 c1=$(printf "\033[34;1m")
134 c2=$(printf "\033[35m")
135@@ -26,9 +24,6 @@ if [ "$TERM" = "linux" ]; then
136 c9=$(printf "\033[34m")
137 fi
138
139-#local newtv=$(perl $HOME/devel/newtv.pl)
140-local newtv=''
141-
142 zstyle ':vcs_info:*' actionformats \
143 '%{$c8%}(%f%s)%{$c7%}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
144 zstyle ':vcs_info:*' formats \
145@@ -42,38 +37,23 @@ prompt_jnrowe_precmd () {
146 vcs_info
147
148 if [ "${vcs_info_msg_0_}" = "" ]; then
149- #dir_status="|%F{3}%n%F{7}@%F{3}%m%F{7}:%F{9}%l%f"
150- #dir_status="$c1%n%F{7}@%F{9}%m%F{7}:%F{12}%/"
151 dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
152- #dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$foopath%} %{$c0%}(%{$c5%}%?%{$c0%})"
153-
154- PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%}
155+ PROMPT='${dir_status} ${ret_status}%{$reset_color%}
156 > '
157 elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then
158 dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
159 PROMPT='${vcs_info_msg_0_}
160-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
161+${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
162 > '
163-
164 elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then
165 dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
166-
167 PROMPT='${vcs_info_msg_0_}
168-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
169+${dir_status}%{$reset_color%}
170 %{$c9%}·>%{$c0%} '
171 else
172 dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
173 PROMPT='${vcs_info_msg_0_}
174-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
175+${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
176 > '
177-
178 fi
179 }
180-
181-
182-#PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$reset_color%} ${vcs_info_msg_0_}${dir_status}%{$reset_color%}
183-#> '
184-
185-# vim: set ft=zsh ts=4 sw=4 et:
186-
187-
188diff --git a/themes/trapd00r.zsh-theme b/themes/trapd00r.zsh-theme
189index 144d2549a5012de806761d20998a18ac5200d17d..7a589a699f47820893a49bf9850b6e8cda307d59 100644
190--- a/themes/trapd00r.zsh-theme
191+++ b/themes/trapd00r.zsh-theme
192@@ -109,23 +109,23 @@ prompt_jnrowe_precmd () {
193 vcs_info
194 if [ "${vcs_info_msg_0_}" = "" ]; then
195 dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
196- PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%}
197+ PROMPT='${dir_status} ${ret_status}%{$reset_color%}
198 > '
199 # modified, to be committed
200 elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then
201 dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
202 PROMPT='${vcs_info_msg_0_}%{$30%} %{$bg_bold[red]%}%{$fg_bold[cyan]%}C%{$fg_bold[black]%}OMMIT%{$reset_color%}
203-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
204+${dir_status}%{$reset_color%}
205 > '
206 elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then
207 dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
208 PROMPT='${vcs_info_msg_0_}%{$bg_bold[red]%}%{$fg_bold[blue]%}D%{$fg_bold[black]%}IRTY%{$reset_color%}
209-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
210+${dir_status}%{$reset_color%}
211 %{$c13%}>%{$c0%} '
212 else
213 dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$(zsh_path)%} %{$c0%}(%{$c5%}%?%{$c0%})"
214 PROMPT='${vcs_info_msg_0_}
215-%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
216+${dir_status}%{$reset_color%}
217 > '
218 fi
219 }