summaryrefslogtreecommitdiff
path: root/themes/gallois.zsh-theme
diff options
context:
space:
mode:
authorDaniel Farrell <dfarrell07@gmail.com>2014-03-25 23:37:28 -0400
committerDaniel Farrell <dfarrell07@gmail.com>2014-03-25 23:37:28 -0400
commitb2ce306c4f49ebb1ef2bde5b86d553ce6ea674aa (patch)
tree3e44b494bb366c6e1586e45c3c76cb536ed75fb3 /themes/gallois.zsh-theme
parent3976b93f3931a7ebc913576015ff395dcd495d95 (diff)
downloadzsh-b2ce306c4f49ebb1ef2bde5b86d553ce6ea674aa.tar.gz
zsh-b2ce306c4f49ebb1ef2bde5b86d553ce6ea674aa.tar.bz2
zsh-b2ce306c4f49ebb1ef2bde5b86d553ce6ea674aa.zip
Simplified gallois RPS1 setup using some helpful scripts
Diffstat (limited to 'themes/gallois.zsh-theme')
-rw-r--r--themes/gallois.zsh-theme20
1 files changed, 6 insertions, 14 deletions
diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index f31d21958..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 &> /dev/null` && -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 '