diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2019-05-08 08:50:31 +0200 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2019-05-08 08:50:31 +0200 |
| commit | 76c7bd57c332b3d9231dc2c6167f3c5d3e56e110 (patch) | |
| tree | acdc36193f390e01f4144ff8feefd126b5aecd8b /themes/dallas.zsh-theme | |
| parent | ea3e666e04bfae31b37ef42dfe54801484341e46 (diff) | |
| parent | 299cd4777a8b9da1934a1ed0c80767eea6691a70 (diff) | |
| download | zsh-76c7bd57c332b3d9231dc2c6167f3c5d3e56e110.tar.gz zsh-76c7bd57c332b3d9231dc2c6167f3c5d3e56e110.tar.bz2 zsh-76c7bd57c332b3d9231dc2c6167f3c5d3e56e110.zip | |
Merge branch 'apjanke/themes-rvm-prompt-function' (#4588)
Fixes #4272
Fixes #4182
Closes #4197
Closes #4588
Diffstat (limited to 'themes/dallas.zsh-theme')
| -rw-r--r-- | themes/dallas.zsh-theme | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/themes/dallas.zsh-theme b/themes/dallas.zsh-theme index e9e86177b..d6c417fc3 100644 --- a/themes/dallas.zsh-theme +++ b/themes/dallas.zsh-theme @@ -2,14 +2,6 @@ # Grab the current date (%D) and time (%T) wrapped in {}: {%D %T} DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}" -# Grab the current version of ruby in use (via RVM): [ruby-1.8.7] -if [ -e ~/.rvm/bin/rvm-prompt ]; then - DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}" -else - if which rbenv &> /dev/null; then - DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg[white]%}]%{$reset_color%}" - fi -fi # Grab the current machine name: muscato DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}" # Grab the current filepath, use shortcuts: ~/Desktop @@ -28,5 +20,8 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" # Add 3 cyan ✗s if this branch is diiirrrty! Dirty branch! ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[cyan]%}✗✗✗" +ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[white]%}[%{$fg[magenta]%}" +ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$fg[white]%}]%{$reset_color%}" + # Put it all together! -PROMPT="$DALLAS_CURRENT_TIME_$DALLAS_CURRENT_RUBY_$DALLAS_CURRENT_MACH_$DALLAS_CURRENT_LOCA_ $DALLAS_CURRENT_USER_$DALLAS_PROMPT_CHAR_ " +PROMPT="$DALLAS_CURRENT_TIME_\$(ruby_prompt_info)$DALLAS_CURRENT_MACH_$DALLAS_CURRENT_LOCA_ $DALLAS_CURRENT_USER_$DALLAS_PROMPT_CHAR_ " |