Diff
1diff --git a/.gitignore b/.gitignore
2index f84db6dc27af34f9f8e393f39a8aedf04ef86c0d..8d19d100c593afe9d4524f55b84c4b6c45eafbbd 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -1,5 +1,5 @@
6 locals.zsh
7 log/.zsh_history
8 projects.zsh
9-custom/*.zsh
10+custom/*
11 !custom/example.zsh
12diff --git a/lib/aliases.zsh b/lib/aliases.zsh
13index d2d3aed811f08191cab9c012de2284e4f32b8354..b47de5bde5a573e4c9465048111c133b3213edc3 100644
14--- a/lib/aliases.zsh
15+++ b/lib/aliases.zsh
16@@ -21,3 +21,5 @@ alias ll='ls -l'
17 alias sl=ls # often screw this up
18
19 alias afind='ack-grep -il'
20+
21+alias x=extract
22diff --git a/lib/appearance.zsh b/lib/appearance.zsh
23index ffee52b5e50a6e354d1adb5d94d877fe7ea3cb57..aec67721a8414ba3386b4d2a9f87306235e3eb16 100644
24--- a/lib/appearance.zsh
25+++ b/lib/appearance.zsh
26@@ -34,5 +34,3 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" # Text to display if the branch is c
27 # Setup the prompt with pretty colors
28 setopt prompt_subst
29
30-# Load the theme
31-source "$ZSH/themes/$ZSH_THEME.zsh-theme"
32diff --git a/lib/directories.zsh b/lib/directories.zsh
33index 56d7a2316db5cb56d6077e08f0b885f9b24b2c7a..bb114f61531a2086ebf16d9266d519dba592c0be 100644
34--- a/lib/directories.zsh
35+++ b/lib/directories.zsh
36@@ -36,5 +36,9 @@ cd () {
37
38 alias md='mkdir -p'
39 alias rd=rmdir
40+alias d='dirs -v'
41
42-alias d='dirs -v'
43+# mkdir & cd to it
44+function mcd() {
45+ mkdir -p "$1" && cd "$1";
46+}
47diff --git a/lib/functions.zsh b/lib/functions.zsh
48index e3c0de43ed8852c672b877177898f27f52af2a02..914f2ef25a22d141cfd2e8c9c6255e535641274b 100644
49--- a/lib/functions.zsh
50+++ b/lib/functions.zsh
51@@ -37,3 +37,39 @@ function take() {
52 mkdir -p $1
53 cd $1
54 }
55+
56+function extract() {
57+ unset REMOVE_ARCHIVE
58+
59+ if test "$1" = "-r"; then
60+ REMOVE=1
61+ shift
62+ fi
63+ if [[ -f $1 ]]; then
64+ case $1 in
65+ *.tar.bz2) tar xvjf $1;;
66+ *.tar.gz) tar xvzf $1;;
67+ *.tar.xz) tar xvJf $1;;
68+ *.tar.lzma) tar --lzma -xvf $1;;
69+ *.bz2) bunzip $1;;
70+ *.rar) unrar $1;;
71+ *.gz) gunzip $1;;
72+ *.tar) tar xvf $1;;
73+ *.tbz2) tar xvjf $1;;
74+ *.tgz) tar xvzf $1;;
75+ *.zip) unzip $1;;
76+ *.Z) uncompress $1;;
77+ *.7z) 7z x $1;;
78+ *) echo "'$1' cannot be extracted via >extract<";;
79+ esac
80+
81+ if [[ $REMOVE_ARCHIVE -eq 1 ]]; then
82+ echo removing "$1";
83+ /bin/rm "$1";
84+ fi
85+
86+ else
87+ echo "'$1' is not a valid file"
88+ fi
89+}
90+
91diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
92index 848e48eb5e7002391a4a352c8bd7828a09023998..291772dfe0b8bc5345717ef2b185eb7b52fa3194 100644
93--- a/oh-my-zsh.sh
94+++ b/oh-my-zsh.sh
95@@ -14,6 +14,9 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
96 plugin=${plugin:=()}
97 for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
98
99+# Load the theme
100+source "$ZSH/themes/$ZSH_THEME.zsh-theme"
101+
102 # Check for updates on initial load...
103 if [ "$DISABLE_AUTO_UPDATE" = "true" ]
104 then
105diff --git a/plugins/gem/gem.plugin.zsh b/plugins/gem/gem.plugin.zsh
106index 65d3766f34f20c819e29ddba81a86d84f1c3675d..d4e5c6584a8289c6d4097cd2090fb71a48ef69c6 100644
107--- a/plugins/gem/gem.plugin.zsh
108+++ b/plugins/gem/gem.plugin.zsh
109@@ -1,4 +1,4 @@
110-# add brew completion function to path
111+# add gem completion function to path
112 fpath=($ZSH/plugins/gem $fpath)
113 autoload -U compinit
114 compinit -i
115diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
116index d317d179d8ec7bce0ecf600ec237d5c754f47215..71a62819bbd5decbd8de84a83f14ee98fbc56925 100644
117--- a/plugins/git/git.plugin.zsh
118+++ b/plugins/git/git.plugin.zsh
119@@ -8,6 +8,7 @@ alias gd='git diff | mate'
120 alias gdv='git diff -w "$@" | vim -R -'
121 alias gc='git commit -v'
122 alias gca='git commit -v -a'
123+alias gco='git checkout'
124 alias gb='git branch'
125 alias gba='git branch -a'
126 alias gcount='git shortlog -sn'
127@@ -26,7 +27,7 @@ function current_branch() {
128 echo ${ref#refs/heads/}
129 }
130
131-# these aliases take advangate of the previous function
132+# these aliases take advantage of the previous function
133 alias ggpull='git pull origin $(current_branch)'
134 alias ggpush='git push origin $(current_branch)'
135-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
136+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
137diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
138new file mode 100644
139index 0000000000000000000000000000000000000000..20ba0408ce8ccd1773282bfec3f87f6df97b418e
140--- /dev/null
141+++ b/plugins/rails3/rails3.plugin.zsh
142@@ -0,0 +1,8 @@
143+alias rs='ruby script/rails server'
144+alias rg='ruby script/rails generate'
145+alias rd='ruby script/rails destroy'
146+alias rp='ruby script/rails plugin'
147+alias rdbm='rake db:migrate db:test:clone'
148+alias rc='ruby script/rails console'
149+alias rd='ruby script/rais server --debugger'
150+alias devlog='tail -f log/development.log'
151diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
152new file mode 100644
153index 0000000000000000000000000000000000000000..45d4613069dafba044eece540faaf74266422b9e
154--- /dev/null
155+++ b/plugins/svn/svn.plugin.zsh
156@@ -0,0 +1,42 @@
157+function svn_prompt_info {
158+ if [[ -d .svn ]]; then
159+ echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
160+$ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
161+ fi
162+}
163+
164+
165+function in_svn() {
166+ if [[ -d .svn ]]; then
167+ echo 1
168+ fi
169+}
170+
171+function svn_get_repo_name {
172+ if [ is_svn ]; then
173+ svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
174+
175+ svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
176+ fi
177+}
178+
179+function svn_get_rev_nr {
180+ if [ is_svn ]; then
181+ svn info 2> /dev/null | sed -n s/Revision:\ //p
182+ fi
183+}
184+
185+function svn_dirty_choose {
186+ if [ is_svn ]; then
187+ s=$(svn status 2>/dev/null)
188+ if [ $s ]; then
189+ echo $1
190+ else
191+ echo $2
192+ fi
193+ fi
194+}
195+
196+function svn_dirty {
197+ svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
198+}
199diff --git a/themes/afowler.zsh-theme b/themes/afowler.zsh-theme
200index b5a9bb1730da771dd6cc253e1676e3382285b808..3a4753fc105f01c21e30d7886f887360cec74da7 100644
201--- a/themes/afowler.zsh-theme
202+++ b/themes/afowler.zsh-theme
203@@ -1,4 +1,4 @@
204-if [ "$(whoami)" = "root" ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
205+if [ $UID -eq 0 ]; then CARETCOLOR="red"; else CARETCOLOR="blue"; fi
206
207 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
208
209diff --git a/themes/arrow.zsh-theme b/themes/arrow.zsh-theme
210index a23efd1d763e3f4fca4f488f7286958c76d0fe07..d62dcdcb9d7fc8cdb47206675dc9250d8efe6c96 100644
211--- a/themes/arrow.zsh-theme
212+++ b/themes/arrow.zsh-theme
213@@ -1,4 +1,4 @@
214-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
215+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
216
217 PROMPT='%{$fg[$NCOLOR]%}%c ➤ %{$reset_color%}'
218 RPROMPT='%{$fg[$NCOLOR]%}%p $(git_prompt_info)%{$reset_color%}'
219diff --git a/themes/awesomepanda.zsh-theme b/themes/awesomepanda.zsh-theme
220new file mode 100644
221index 0000000000000000000000000000000000000000..411b898371ade495a7924e6cd871d8f442d13b82
222--- /dev/null
223+++ b/themes/awesomepanda.zsh-theme
224@@ -0,0 +1,18 @@
225+# the svn plugin has to be activated for this to work.
226+
227+PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%}$(svn_prompt_info)%{$reset_color%}'
228+
229+ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
230+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
231+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[yellow]%} ✗ %{$reset_color%}"
232+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}) "
233+
234+
235+
236+ZSH_PROMPT_BASE_COLOR="%{$fg_bold[blue]%}"
237+ZSH_THEME_REPO_NAME_COLOR="%{$fg_bold[red]%}"
238+
239+ZSH_THEME_SVN_PROMPT_PREFIX="svn:("
240+ZSH_THEME_SVN_PROMPT_SUFFIX=")"
241+ZSH_THEME_SVN_PROMPT_DIRTY="%{$fg[red]%} ✘ %{$reset_color%}"
242+ZSH_THEME_SVN_PROMPT_CLEAN=" "
243diff --git a/themes/clean.zsh-theme b/themes/clean.zsh-theme
244index 95f532a823f589722c35fe95e6ae282126b69d16..7ee29cb8ccea928eb93da029ba95b14fc18c4ffc 100644
245--- a/themes/clean.zsh-theme
246+++ b/themes/clean.zsh-theme
247@@ -1,4 +1,4 @@
248-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="white"; fi
249+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="white"; fi
250
251 PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) '
252 RPROMPT='[%*]'
253diff --git a/themes/dieter.zsh-theme b/themes/dieter.zsh-theme
254new file mode 100644
255index 0000000000000000000000000000000000000000..0a5e9265bd680e628c2da9ae61b5ae37159d1214
256--- /dev/null
257+++ b/themes/dieter.zsh-theme
258@@ -0,0 +1,56 @@
259+# the idea of this theme is to contain a lot of info in a small string, by
260+# compressing some parts and colorcoding, which bring useful visual cues,
261+# while limiting the amount of colors and such to keep it easy on the eyes.
262+# When a command exited >0, the timestamp will be in red and the exit code
263+# will be on the right edge.
264+# The exit code visual cues will only display once.
265+# (i.e. they will be reset, even if you hit enter a few times on empty command prompts)
266+
267+typeset -A host_repr
268+
269+# translate hostnames into shortened, colorcoded strings
270+host_repr=('dieter-ws-a7n8x-arch' "%{$fg_bold[green]%}ws" 'dieter-p4sci-arch' "%{$fg_bold[blue]%}p4")
271+
272+# local time, color coded by last return code
273+time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
274+time_disabled="%{$fg[green]%}%*%{$reset_color%}"
275+time=$time_enabled
276+
277+# user part, color coded by privileges
278+local user="%(!.%{$fg[blue]%}.%{$fg[blue]%})%n%{$reset_color%}"
279+
280+# Hostname part. compressed and colorcoded per host_repr array
281+# if not found, regular hostname in default color
282+local host="@${host_repr[$(hostname)]:-$(hostname)}%{$reset_color%}"
283+
284+# Compacted $PWD
285+local pwd="%{$fg[blue]%}%c%{$reset_color%}"
286+
287+PROMPT='${time} ${user}${host} ${pwd} $(git_prompt_info)'
288+
289+# i would prefer 1 icon that shows the "most drastic" deviation from HEAD,
290+# but lets see how this works out
291+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}"
292+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
293+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}?%{$fg[green]%}%{$reset_color%}"
294+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}"
295+
296+# elaborate exitcode on the right when >0
297+return_code_enabled="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
298+return_code_disabled=
299+return_code=$return_code_enabled
300+
301+RPS1='${return_code}'
302+
303+function accept-line-or-clear-warning () {
304+ if [[ -z $BUFFER ]]; then
305+ time=$time_disabled
306+ return_code=$return_code_disabled
307+ else
308+ time=$time_enabled
309+ return_code=$return_code_enabled
310+ fi
311+ zle accept-line
312+}
313+zle -N accept-line-or-clear-warning
314+bindkey '^M' accept-line-or-clear-warning
315diff --git a/themes/dst.zsh-theme b/themes/dst.zsh-theme
316index fa0d9cb06bf605df6a54f3db163e52e9c6e31176..3e2539d57592937a074e0c01e68bd76cf0d539d2 100644
317--- a/themes/dst.zsh-theme
318+++ b/themes/dst.zsh-theme
319@@ -5,7 +5,7 @@ ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
320 ZSH_THEME_GIT_PROMPT_CLEAN=""
321
322 function prompt_char {
323- if [ "$(whoami)" = "root" ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
324+ if [ $UID -eq 0 ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
325 }
326
327 PROMPT='%(?, ,%{$fg[red]%}FAIL%{$reset_color%}
328diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
329new file mode 100644
330index 0000000000000000000000000000000000000000..f22eda868501accc1aed45380a70d634eb8d0435
331--- /dev/null
332+++ b/themes/fishy.zsh-theme
333@@ -0,0 +1,9 @@
334+# ZSH Theme emulating the Fish shell's default prompt.
335+
336+local user_color='green'; [ $UID -eq 0 ] && user_color='red'
337+PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) '
338+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
339+RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)'
340+
341+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}"
342+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
343diff --git a/themes/flazz.zsh-theme b/themes/flazz.zsh-theme
344new file mode 100644
345index 0000000000000000000000000000000000000000..280794f2b83c33bf3c039e2fdb3a868b92d55ca2
346--- /dev/null
347+++ b/themes/flazz.zsh-theme
348@@ -0,0 +1,19 @@
349+if [ "$(whoami)" = "root" ]
350+then CARETCOLOR="red"
351+else CARETCOLOR="blue"
352+fi
353+
354+local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
355+
356+PROMPT='%m%{${fg_bold[magenta]}%} :: %{$reset_color%}%{${fg[green]}%}%3~ $(git_prompt_info)%{${fg_bold[$CARETCOLOR]}%}%#%{${reset_color}%} '
357+
358+RPS1='$(vi_mode_prompt_info) ${return_code}'
359+
360+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[cyan]%}‹"
361+ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
362+
363+MODE_INDICATOR="%{$fg_bold[magenta]%}<%{$reset_color%}%{$fg[magenta]%}<<%{$reset_color%}"
364+
365+# TODO use 265 colors
366+#MODE_INDICATOR="$FX[bold]$FG[020]<$FX[no_bold]%{$fg[blue]%}<<%{$reset_color%}"
367+# TODO use two lines if git
368diff --git a/themes/gentoo.zsh-theme b/themes/gentoo.zsh-theme
369new file mode 100644
370index 0000000000000000000000000000000000000000..cba143d426d0dadd49d1d8a9be2e966501f5c580
371--- /dev/null
372+++ b/themes/gentoo.zsh-theme
373@@ -0,0 +1,4 @@
374+PROMPT='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(git_prompt_info)%#%{$reset_color%} '
375+
376+ZSH_THEME_GIT_PROMPT_PREFIX="("
377+ZSH_THEME_GIT_PROMPT_SUFFIX=") "
378diff --git a/themes/jreese.zsh-theme b/themes/jreese.zsh-theme
379index 534664f115e4c8b5bcd3af8eb360362ea6de6b6b..0fa6b4ecd5e85596e80e7cc1dd1894878aa0f7ac 100644
380--- a/themes/jreese.zsh-theme
381+++ b/themes/jreese.zsh-theme
382@@ -1,6 +1,6 @@
383 # ZSH Theme - Preview: http://dl.dropbox.com/u/1552408/Screenshots/2010-04-08-oh-my-zsh.png
384
385-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
386+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
387 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
388
389 PROMPT='%{$fg[$NCOLOR]%}%n%{$fg[green]%}@%m%{$reset_color%} %~ \
390diff --git a/themes/kardan.zsh-theme b/themes/kardan.zsh-theme
391new file mode 100644
392index 0000000000000000000000000000000000000000..fd6586a9d70ce03e7fe20bdc7921d66b94e3576e
393--- /dev/null
394+++ b/themes/kardan.zsh-theme
395@@ -0,0 +1,12 @@
396+# Simple theme based on my old zsh settings.
397+
398+function get_host {
399+ echo '@'`hostname`''
400+}
401+
402+PROMPT='> '
403+RPROMPT='%~$(git_prompt_info)$(get_host)'
404+
405+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}✗%{$reset_color%}"
406+ZSH_THEME_GIT_PROMPT_PREFIX="("
407+ZSH_THEME_GIT_PROMPT_SUFFIX=")"
408diff --git a/themes/lambda.zsh-theme b/themes/lambda.zsh-theme
409new file mode 100644
410index 0000000000000000000000000000000000000000..63292d3314607a0abbabcc2ce0002d39b975f218
411--- /dev/null
412+++ b/themes/lambda.zsh-theme
413@@ -0,0 +1,6 @@
414+# ZSH Theme - Preview: http://cl.ly/350F0F0k1M2y3A2i3p1S
415+
416+PROMPT='λ %~/ $(git_prompt_info)%{$reset_color%}'
417+
418+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}"
419+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
420diff --git a/themes/philips.zsh-theme b/themes/philips.zsh-theme
421index fa7c590355a2a1fcd8b7c4d87ad19e9f234be2eb..e7ea51a2ff8202536a24790780064ecf0d6ade7f 100644
422--- a/themes/philips.zsh-theme
423+++ b/themes/philips.zsh-theme
424@@ -1,4 +1,4 @@
425-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
426+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
427
428 PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(git_prompt_info)%(!.#.$) '
429 RPROMPT='[%*]'
430diff --git a/themes/pmcgee.zsh-theme b/themes/pmcgee.zsh-theme
431index 4eb54df5baaf5922c19a801882359de3f737ef27..e4e45c71adfa23054eca9eb3daadda8856b6874c 100644
432--- a/themes/pmcgee.zsh-theme
433+++ b/themes/pmcgee.zsh-theme
434@@ -1,4 +1,4 @@
435-if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
436+if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
437
438 PROMPT='
439 %{$fg[$NCOLOR]%}%B%n@%m%b%{$reset_color%} %{$fg[white]%}%B${PWD/#$HOME/~}%b%{$reset_color%}
440diff --git a/themes/rixius.zsh-theme b/themes/rixius.zsh-theme
441new file mode 100644
442index 0000000000000000000000000000000000000000..c0c5c9c718ad77d52876c8438903ad40069f24a9
443--- /dev/null
444+++ b/themes/rixius.zsh-theme
445@@ -0,0 +1,24 @@
446+# /|/ Code by Stephen
447+# /|/ "Rixius" Middleton
448+#
449+# name in folder (github)
450+# ± if in github repo, or ≥ if otherwise Time in 24-hour format is on right.
451+function collapse_pwd {
452+ echo $(pwd | sed -e "s,^$HOME,~,")
453+}
454+function prompt_char {
455+ echo -n "%{$bg[white]%}%{$fg[red]%}"
456+ git branch >/dev/null 2>/dev/null && echo "±%{$reset_color%}" && return
457+ echo "≥%{$reset_color%}"
458+}
459+RIXIUS_PRE="%{$bg[white]%}%{$fg[red]%}"
460+
461+PROMPT='
462+%{$RIXIUS_PRE%}%n%{$reset_color%} in %{$fg_bold[green]%}$(collapse_pwd)%{$reset_color%}$(git_prompt_info)
463+$(prompt_char) '
464+RPROMPT='%{$RIXIUS_PRE%}%T%{$reset_color%}'
465+
466+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
467+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
468+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$RIXIUS_PRE%}!%{$reset_color%}"
469+ZSH_THEME_GIT_PROMPT_CLEAN=" %{$RIXIUS_PRE%}√%{$reset_color%}"
470diff --git a/themes/theunraveler.zsh-theme b/themes/theunraveler.zsh-theme
471index 4eec8e827d98b1f5df8a780bfe03e3f87de25d18..e4bfb79c5fb742a903e77178025998188b5a15b1 100644
472--- a/themes/theunraveler.zsh-theme
473+++ b/themes/theunraveler.zsh-theme
474@@ -1,6 +1,16 @@
475-# Comment
476+# Comment
477
478-ZSH_THEME_GIT_PROMPT_PREFIX=' (git:'
479-ZSH_THEME_GIT_PROMPT_SUFFIX=')'
480+PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
481
482-PROMPT='%{$fg[magenta]%}[%c]$(git_prompt_info) $ %{$reset_color%}'
483+RPROMPT='%{$fg[magenta]%}$(git_prompt_info)%{$reset_color%} $(git_prompt_status)%{$reset_color%}'
484+
485+ZSH_THEME_GIT_PROMPT_PREFIX=""
486+ZSH_THEME_GIT_PROMPT_SUFFIX=""
487+ZSH_THEME_GIT_PROMPT_DIRTY=""
488+ZSH_THEME_GIT_PROMPT_CLEAN=""
489+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
490+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭"
491+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗"
492+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦"
493+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂"
494+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱"