Diff
1diff --git a/themes/ys.zsh-theme b/themes/ys.zsh-theme
2index 81f7e03faacf48c2826787a4b8e0ede82c61cc6c..3d316390ee81be3c2f275221e9438745c3ddd86e 100644
3--- a/themes/ys.zsh-theme
4+++ b/themes/ys.zsh-theme
5@@ -1,22 +1,34 @@
6 # Clean, simple, compatible and meaningful.
7-# Tested on Linux, Unix and Windows.
8-# It is recommanded to use with a dark background and the font Inconsolata.
9+# Tested on Linux, Unix and Windows under ANSI colors.
10+# It is recommended to use with a dark background and the font Inconsolata.
11 # Colors: black, red, green, yellow, *blue, magenta, cyan, and white.
12-#
13-# Oct 2012 ys
14+#
15+# http://ysmood.org/wp/2013/03/my-ys-terminal-theme/
16+# Mar 2013 ys
17
18+# Machine name.
19 function box_name {
20 [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
21 }
22
23+# Directory info.
24 local current_dir='${PWD/#$HOME/~}'
25-local git_info='$(git_prompt_info)'
26
27+# Git info.
28+local git_info='$(git_prompt_info)'
29 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}on%{$reset_color%} git:%{$fg[cyan]%}"
30 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
31 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}x"
32 ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}o"
33
34+# Prompt format: \n # USER at MACHINE in DIRECTORY on git:BRANCH STATE [TIME] \n $
35 PROMPT="
36-# %{$fg[green]%}%n%{$reset_color%} %{$fg[white]%}at%{$reset_color%} %{$fg[cyan]%}$(box_name)%{$reset_color%} %{$fg[white]%}in%{$reset_color%} %{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}${git_info} %{$fg[white]%}[%*]%{$reset_color%}
37-%{$fg[red]%}$ %{$reset_color%}"
38+%{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
39+%{$fg[cyan]%}%n \
40+%{$fg[white]%}at \
41+%{$fg[green]%}$(box_name) \
42+%{$fg[white]%}in \
43+%{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
44+${git_info} \
45+%{$fg[white]%}[%*]
46+%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"