summaryrefslogtreecommitdiff
path: root/themes/amuse.zsh-theme
diff options
context:
space:
mode:
authorAndrew Janke <andrew@apjanke.net>2015-09-28 08:52:03 -0400
committerAndrew Janke <andrew@apjanke.net>2015-09-28 08:52:03 -0400
commite4fdb083655fc582ebcecb07cd1bd1130077f0e4 (patch)
treefee07d9adfee79d1c88206ead154a23520ac51cb /themes/amuse.zsh-theme
parent5c8b0cc0c1782b34790548498018fb9e0300992b (diff)
parentb05ef1034fffd7b0c29f1558a8a357ccce7ae74b (diff)
downloadzsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.gz
zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.bz2
zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.zip
Merge branch 'master' into copyfile-portability
Diffstat (limited to 'themes/amuse.zsh-theme')
-rw-r--r--themes/amuse.zsh-theme12
1 files changed, 10 insertions, 2 deletions
diff --git a/themes/amuse.zsh-theme b/themes/amuse.zsh-theme
index 548f6d39d..4e7361ced 100644
--- a/themes/amuse.zsh-theme
+++ b/themes/amuse.zsh-theme
@@ -12,10 +12,18 @@ PROMPT='
%{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info) ⌚ %{$fg_bold[red]%}%*%{$reset_color%}
$ '
-ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}⭠ "
+# Must use Powerline font, for \uE0A0 to render.
+ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}\uE0A0 "
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
ZSH_THEME_GIT_PROMPT_CLEAN=""
-RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}'
+if [ -e ~/.rvm/bin/rvm-prompt ]; then
+ RPROMPT='%{$fg_bold[red]%}‹$(rvm_current)›%{$reset_color%}'
+else
+ if which rbenv &> /dev/null; then
+ RPROMPT='%{$fg_bold[red]%}$(rbenv_version)%{$reset_color%}'
+ fi
+fi
+