diff options
| author | Robby Russell <robby@planetargon.com> | 2013-12-02 23:30:25 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-12-02 23:30:25 -0800 |
| commit | 3ff772d68b84cb43e17bfa927c3d989c810a16bd (patch) | |
| tree | 22a4a8ada911d3327302af56cc5fc423371e9518 | |
| parent | bbadcf77e31d92070dafd7024b2e4dff8b481d8d (diff) | |
| parent | 5bad3f890de691194b77cfc33846e2102e21ea93 (diff) | |
| download | zsh-3ff772d68b84cb43e17bfa927c3d989c810a16bd.tar.gz zsh-3ff772d68b84cb43e17bfa927c3d989c810a16bd.tar.bz2 zsh-3ff772d68b84cb43e17bfa927c3d989c810a16bd.zip | |
Merge pull request #2022 from Zhann/master
Updates Zhann theme
| -rw-r--r-- | themes/zhann.zsh-theme | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/themes/zhann.zsh-theme b/themes/zhann.zsh-theme index 5c49fe79b..5c0854730 100644 --- a/themes/zhann.zsh-theme +++ b/themes/zhann.zsh-theme @@ -1,15 +1,25 @@ -PROMPT='%{$fg_bold[green]%}%p %{$fg[cyan]%}%c%{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' +autoload -U colors && colors -if [ -e ~/.rvm/bin/rvm-prompt ]; then - RPROMPT='%{$reset_color%} %{$fg[red]%}$(~/.rvm/bin/rvm-prompt i v g) %{$reset_color%}' -else - if which rbenv &> /dev/null; then - RPROMPT='%{$reset_color%} %{$fg[red]%}$(rbenv version | sed -e "s/ (set.*$//") %{$reset_color%}' - fi -fi +autoload -Uz vcs_info +zstyle ':vcs_info:*' stagedstr '%F{green}●' +zstyle ':vcs_info:*' unstagedstr '%F{yellow}●' +zstyle ':vcs_info:*' check-for-changes true +zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{11}%r' +zstyle ':vcs_info:*' enable git svn +theme_precmd () { + if [[ -z $(git ls-files --other --exclude-standard 2> /dev/null) ]] { + zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{green}]' + } else { + zstyle ':vcs_info:*' formats ' [%b%c%u%B%F{red}●%F{green}]' + } + + vcs_info +} + +setopt prompt_subst +PROMPT='%B%F{blue}%c%B%F{green}${vcs_info_msg_0_}%B%F{magenta} %{$reset_color%}% ' + +autoload -U add-zsh-hook +add-zsh-hook precmd theme_precmd -ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[red]%}" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})" |