linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-02 02:19:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 829f267657 into 1120f97305

Browse source
This commit is contained in:
GitHub Merge Button 2012-02-23 12:36:00 -08:00
commit 03765ce629
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/rvm.zsh
View file

@ -1,7 +1,7 @@
# get the name of the branch we are on # get the name of the branch we are on
function rvm_prompt_info() { function rvm_prompt_info() {
ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
echo "($ruby_version)" echo "$ruby_version"
} }

17
themes/risto.zsh-theme
View file

@ -1,6 +1,15 @@
# -*- sh -*- vim:set ft=sh ai et sw=4 sts=4: # Risto Theme
# It might be bash like, but I can't have my co-workers knowing I use zsh #
PROMPT='%{$fg[green]%}%n@%m:%{$fg_bold[blue]%}%2~ $(git_prompt_info)%{$reset_color%}%(!.#.$) ' # Requires the svn plugin
#
PROMPT='%{$fg[green]%}%n@%m:%{$fg[blue]%}%2~ $(svn_prompt_info)$(git_prompt_info)%{$reset_color%}%(!.#.%%) '
RPROMPT='%{$fg_bold[red]%}$(rvm_prompt_info)%{$reset_color%}%'
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}‹" ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}‹"
ZSH_THEME_GIT_PROMPT_SUFFIX="›%{$reset_color%}" ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[red]%}›%{$reset_color%}"
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}✓"
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[yellow]%}∗"
ZSH_THEME_GIT_PROMPT_CLEAN=""
ZSH_THEME_SVN_PROMPT_PREFIX="%{$fg[red]%}‹"
ZSH_THEME_SVN_PROMPT_SUFFIX="›%{$reset_color%}"