diff options
| author | Dawid Ferenczy <dawid@ferenczy.cz> | 2015-08-25 16:34:04 +0200 |
|---|---|---|
| committer | Dawid Ferenczy <dawid@ferenczy.cz> | 2015-08-25 16:34:04 +0200 |
| commit | 18ef1ee6481dbeca4fbecf3de627f946860ffd5a (patch) | |
| tree | cb07e72538c470bb486596d955c7912c5b05e23e /themes/gallois.zsh-theme | |
| parent | eafd5f325208421b82a770e57441dd1063eb5745 (diff) | |
| parent | 192de6bcffb0294e19f4203f6f7dc1a7f3e427be (diff) | |
| download | zsh-18ef1ee6481dbeca4fbecf3de627f946860ffd5a.tar.gz zsh-18ef1ee6481dbeca4fbecf3de627f946860ffd5a.tar.bz2 zsh-18ef1ee6481dbeca4fbecf3de627f946860ffd5a.zip | |
Merge remote-tracking branch 'robbyrussell/master'
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 ' |