summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
authorToon Claes <toon@tonotdo.com>2009-11-09 21:28:17 +0100
committerToon Claes <toon@tonotdo.com>2009-11-09 21:28:17 +0100
commit729fd0ab3cae9636ea8d40b76b80a0763c9150da (patch)
treedfc48d9f58e5448f7efda657f7d85cdbf5c15cc9 /themes
parentbbef2db92b39c41705e0a3f05da525b5b1eb8901 (diff)
parentc620408962dd93fe920414eedd8e8e38b241eb08 (diff)
downloadzsh-729fd0ab3cae9636ea8d40b76b80a0763c9150da.tar.gz
zsh-729fd0ab3cae9636ea8d40b76b80a0763c9150da.tar.bz2
zsh-729fd0ab3cae9636ea8d40b76b80a0763c9150da.zip
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'themes')
-rw-r--r--themes/darkblood.zsh-theme12
-rw-r--r--themes/jnrowe.zsh-theme31
2 files changed, 37 insertions, 6 deletions
diff --git a/themes/darkblood.zsh-theme b/themes/darkblood.zsh-theme
index 8a00c3459..33508fbd2 100644
--- a/themes/darkblood.zsh-theme
+++ b/themes/darkblood.zsh-theme
@@ -1,9 +1,9 @@
# meh. Dark Blood Rewind, a new beginning.
-PROMPT=$'${fg[red]}┌[${fg_bold[white]}%n${reset_color}${fg[red]}@${fg_bold[white]}%m${reset_color}${fg[red]}] [${fg_bold[white]}/dev/%y${reset_color}${fg[red]}] $(git_prompt_info)%(?,,${fg[red]}[${fg_bold[white]}%?${reset_color}${fg[red]}])
-${fg[red]}└[${fg_bold[white]}%~${reset_color}${fg[red]}]>${reset_color} '
-PS2=$' ${fg[red]}|>${reset_color} '
+PROMPT=$'%{$fg[red]%}┌[%{$fg_bold[white]%}%n%{$reset_color%}%{$fg[red]%}@%{$fg_bold[white]%}%m%{$reset_color%}%{$fg[red]%}] [%{$fg_bold[white]%}/dev/%y%{$reset_color%}%{$fg[red]%}] %{$(git_prompt_info)%}%(?,,%{$fg[red]%}[%{$fg_bold[white]%}%?%{$reset_color%}%{$fg[red]%}])
+%{$fg[red]%}└[%{$fg_bold[white]%}%~%{$reset_color%}%{$fg[red]%}]>%{$reset_color%} '
+PS2=$' %{$fg[red]%}|>%{$reset_color%} '
-ZSH_THEME_GIT_PROMPT_PREFIX="${fg[red]}[${fg_bold[white]}"
-ZSH_THEME_GIT_PROMPT_SUFFIX="${reset_color}${fg[red]}] "
-ZSH_THEME_GIT_PROMPT_DIRTY=" ${fg[red]}⚡${reset_color}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}[%{$fg_bold[white]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}%{$fg[red]%}] "
+ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}⚡%{$reset_color%}"
diff --git a/themes/jnrowe.zsh-theme b/themes/jnrowe.zsh-theme
new file mode 100644
index 000000000..7c8a7082e
--- /dev/null
+++ b/themes/jnrowe.zsh-theme
@@ -0,0 +1,31 @@
+autoload -U add-zsh-hook
+autoload -Uz vcs_info
+
+zstyle ':vcs_info:*' actionformats \
+ '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
+zstyle ':vcs_info:*' formats \
+ '%F{2}%s%F{7}:%F{2}(%F{1}%b%F{2})%f '
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+zstyle ':vcs_info:*' enable git
+
+add-zsh-hook precmd prompt_jnrowe_precmd
+
+prompt_jnrowe_precmd () {
+ vcs_info
+
+ if [ "${vcs_info_msg_0_}" = "" ]; then
+ dir_status="%F{2}→%f"
+ elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then
+ dir_status="%F{1}▶%f"
+ elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then
+ dir_status="%F{3}▶%f"
+ else
+ dir_status="%F{2}▶%f"
+ fi
+}
+
+local ret_status="%(?:%{$fg_bold[green]%}Ξ:%{$fg_bold[red]%}%S↑%s%?)"
+
+PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg_bold[yellow]%}%2~ ${vcs_info_msg_0_}${dir_status}%{$reset_color%} '
+
+# vim: set ft=zsh ts=4 sw=4 et: