Merge remote-tracking branch 'ysmood/update_ys_theme'

themes/ys.zsh-theme

@@ -3,45 +3,36 @@
 # It is recommended to use with a dark background and the font Inconsolata.
 # Colors: black, red, green, yellow, *blue, magenta, cyan, and white.
 # 
-# http://ysmood.org/wp/2013/03/my-ys-terminal-theme/
+# http://blog.ysmood.org/2013/03/my-ys-terminal-theme/
 # Mar 2013 ys
 
-# Machine name.
-function box_name {
-    [ -f ~/.box-name ] && cat ~/.box-name || hostname
-}
-
-# Directory info.
-local current_dir='${PWD/#$HOME/~}'
-
-# Git info.
+# Git Info
 local git_info='$(git_prompt_info)'
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}on%{$reset_color%} git:%{$fg[cyan]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}x"
 ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}o"
 
-# Prompt format: \n # USER at MACHINE in DIRECTORY on git:BRANCH STATE [TIME] \n $ 
-PROMPT="
-%{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
-%{$fg[cyan]%}%n \
-%{$fg[white]%}at \
-%{$fg[green]%}$(box_name) \
-%{$fg[white]%}in \
-%{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
-${git_info} \
-%{$fg[white]%}[%*]
-%{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
+: <<'FORMAT'
+Prompt format:
+
+PRIVILEGES USER @ MACHINE in DIRECTORY on git:BRANCH STATE [TIME] L:SHELL_LEVEL N:LINE_NUM
+$ COMMAND
+
+For example:
+
+% ys@ys-mbp in ~/.oh-my-zsh on git:master x [21:47:42] L:1 N:6
+$ 
+
+FORMAT
 
-if [[ "$(whoami)" == "root" ]]; then
 PROMPT="
-%{$terminfo[bold]$fg[blue]%}#%{$reset_color%} \
-%{$bg[yellow]%}%{$fg[cyan]%}%n%{$reset_color%} \
-%{$fg[white]%}at \
-%{$fg[green]%}$(box_name) \
+%{$terminfo[bold]$fg[blue]%}%#%{$reset_color%} \
+%{$fg[cyan]%}%n \
+%{$fg[white]%}@ \
+%{$fg[green]%}%m \
 %{$fg[white]%}in \
-%{$terminfo[bold]$fg[yellow]%}${current_dir}%{$reset_color%}\
+%{$terminfo[bold]$fg[yellow]%}%~%{$reset_color%}\
 ${git_info} \
-%{$fg[white]%}[%*]
+%{$fg[white]%}[%*] tty:%l L:%L N:%i
 %{$terminfo[bold]$fg[red]%}$ %{$reset_color%}"
-fi