Merge pull request #684 from masnick/master

Update to fino.zsh-theme
This commit is contained in:
Robby Russell 2013-12-02 23:11:10 -08:00
commit 2a43c5eebd

View File

@ -1,7 +1,7 @@
# Fino theme by Max Masnick (http://max.masnick.me) # Fino theme by Max Masnick (http://max.masnick.me)
# Use with a dark background and 256-color terminal! # Use with a dark background and 256-color terminal!
# Meant for people with RVM and git. Tested only on OS X 10.7. # Meant for people with rbenv and git. Tested only on OS X 10.7.
# You can set your computer name in the ~/.box-name file if you want. # You can set your computer name in the ~/.box-name file if you want.
@ -11,34 +11,32 @@
# #
# Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/ # Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
function virtualenv_info {
[ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
}
function prompt_char { function prompt_char {
git branch >/dev/null 2>/dev/null && echo '±' && return git branch >/dev/null 2>/dev/null && echo "±" && return
echo '○' echo '○'
} }
function box_name { function box_name {
[ -f ~/.box-name ] && cat ~/.box-name || hostname -s [ -f ~/.box-name ] && cat ~/.box-name || hostname -s
} }
local ruby_env=''
local rvm_ruby=''
if which rvm-prompt &> /dev/null; then if which rvm-prompt &> /dev/null; then
rvm_ruby='$(rvm-prompt i v g)%{$reset_color%}' ruby_env=' $(rvm-prompt i v g)%{$reset_color%}'
else else
if which rbenv &> /dev/null; then if which rbenv &> /dev/null; then
rvm_ruby='$(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%}' ruby_env=' $(rbenv version-name)%{$reset_color%}'
fi fi
fi fi
local current_dir='${PWD/#$HOME/~}' local current_dir='${PWD/#$HOME/~}'
local git_info='$(git_prompt_info)' local git_info='$(git_prompt_info)'
local prompt_char='$(prompt_char)'
PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%} ${rvm_ruby} PROMPT="╭─%{$FG[040]%}%n%{$reset_color%} %{$FG[239]%}at%{$reset_color%} %{$FG[033]%}$(box_name)%{$reset_color%} %{$FG[239]%}in%{$reset_color%} %{$terminfo[bold]$FG[226]%}${current_dir}%{$reset_color%}${git_info} %{$FG[239]%}using%{$FG[243]%}${ruby_env}
╰─$(virtualenv_info)$(prompt_char) " ╰─${prompt_char} "
ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}" ZSH_THEME_GIT_PROMPT_PREFIX=" %{$FG[239]%}on%{$reset_color%} %{$fg[255]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"