diff --git a/lib/rvm.zsh b/lib/rvm.zsh index 597be1b33..58ae153f6 100644 --- a/lib/rvm.zsh +++ b/lib/rvm.zsh @@ -4,4 +4,15 @@ function rvm_prompt_info() { echo "($ruby_version)" } +# get the name of the ruby as well as the gemset +# from http://snipplr.com/view.php?codeview&id=36724 +function rvm_with_gemset { + local gemset=$(echo $GEM_HOME | awk -F'@' '{print $2}') + [ "$gemset" != "" ] && gemset="@$gemset" + # local version=$(echo $MY_RUBY_HOME | awk -F'-' '{print $2}') + local version=$(~/.rvm/bin/rvm-prompt s i v) + [ "$version" != "" ] && version="$version" + local full="$version$gemset" + [ "$full" != "" ] && echo "$full" +} diff --git a/themes/jtzemp.zsh-theme b/themes/jtzemp.zsh-theme new file mode 100644 index 000000000..4a994c29a --- /dev/null +++ b/themes/jtzemp.zsh-theme @@ -0,0 +1,36 @@ +# Personalized! - Based on dallas.zsh-theme + +# Grab the current date (%D) and time (%T) wrapped in {}: {%D %T} +JTZEMP_CURRENT_TIME_="%{$fg[blue]%}[%{$fg[red]%}%T%{$fg[blue]%}]%{$reset_color%}" + +# Grab the current version of ruby in use (via RVM): [ruby-1.8.7@rails2] +JTZEMP_CURRENT_RUBY_="%{$fg[blue]%}[%{$fg[red]%}\$(rvm_with_gemset)%{$fg[blue]%}]%{$reset_color%}" + +# Grab the current machine name: muscato +JTZEMP_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}" + +# Grab the current filepath, use shortcuts: ~/Desktop +# Append the current git branch, if in a git repository: ~aw@master +JTZEMP_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}" + +# Grab the current username +JTZEMP_CURRENT_USER_="%{$fg[green]%}%n@%{$reset_color%}" + +# Use a % for normal users and a # for privelaged (root) users. +JTZEMP_PROMPT_CHAR_="%{$fg[white]%}%(!.#.%%)%{$reset_color%}" + +# For the git prompt, use a white @ and blue text for the branch name +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%}(%{$fg[cyan]%}" + +# Close it all off by resetting the color and styles. +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[blue]%})%{$reset_color%}" + +# Do nothing if the branch is clean (no changes). +ZSH_THEME_GIT_PROMPT_CLEAN="" + +# Add 3 red ✗s if this branch is diiirrrty! Dirty branch! +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ✗✗✗" + + +# Put it all together! +PROMPT="$JTZEMP_CURRENT_TIME_$JTZEMP_CURRENT_RUBY_ $JTZEMP_CURRENT_USER_$JTZEMP_CURRENT_MACH_$JTZEMP_CURRENT_LOCA_ $JTZEMP_PROMPT_CHAR_ "