diff options
| author | zghember <zghpku@gmail.com> | 2014-12-15 00:23:34 +0800 |
|---|---|---|
| committer | zghember <zghpku@gmail.com> | 2014-12-15 00:23:34 +0800 |
| commit | 6fd0b73e9aba568640005798f737cd73ad0bfdf4 (patch) | |
| tree | 22f3654e0c00ffd1cb9c3c05ca5d8bffa190cc1f /themes/gallois.zsh-theme | |
| parent | 6f70d288cc4625142413227109bf1eeac7e2a180 (diff) | |
| parent | 141c2e593401f245a9f9bb0799ada8bf14b677d7 (diff) | |
| download | zsh-6fd0b73e9aba568640005798f737cd73ad0bfdf4.tar.gz zsh-6fd0b73e9aba568640005798f737cd73ad0bfdf4.tar.bz2 zsh-6fd0b73e9aba568640005798f737cd73ad0bfdf4.zip | |
Merge commit '141c2e593401f245a9f9bb0799ada8bf14b677d7'
Diffstat (limited to 'themes/gallois.zsh-theme')
| -rw-r--r-- | themes/gallois.zsh-theme | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme index f1057a9a9..d383ed583 100644 --- a/themes/gallois.zsh-theme +++ b/themes/gallois.zsh-theme @@ -11,19 +11,11 @@ git_custom_status() { fi } -#RVM and git settings -if [[ -s ~/.rvm/scripts/rvm ]] ; then - RPS1='$(git_custom_status)%{$fg[red]%}[`~/.rvm/bin/rvm-prompt`]%{$reset_color%} $EPS1' -else - if which rbenv &> /dev/null; then - RPS1='$(git_custom_status)%{$fg[red]%}[`rbenv version | sed -e "s/ (set.*$//"`]%{$reset_color%} $EPS1' - else - if [[ -n `which chruby_prompt_info` && -n `chruby_prompt_info` ]]; then - RPS1='$(git_custom_status)%{$fg[red]%}[`chruby_prompt_info`]%{$reset_color%} $EPS1' - else - RPS1='$(git_custom_status) $EPS1' - fi - fi -fi +# RVM component of prompt +ZSH_THEME_RVM_PROMPT_PREFIX="%{$fg[red]%}[" +ZSH_THEME_RVM_PROMPT_SUFFIX="]%{$reset_color%}" + +# Combine it all into a final right-side prompt +RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1' PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b ' |