Merge branch 'illenseer' of /home/nils/config/oh-my-zsh

This commit is contained in:
Nils Pascal Illenseer 2011-08-21 12:19:56 +02:00
commit 671cf7c7c7

View file

@ -36,10 +36,8 @@ local ret_status="%(?:%{$fg_bold[green]%}✔:%{$fg_bold[red]%}✘ %s%?)"
# root (red) vs. normal user (green)
if [[ `id -u` -eq 0 ]]; then
user="%{$fg_bold[red]%}%n"
end="#"
else
user="%{$fg_bold[green]%}%n"
end="$"
fi
# local (white) vs. remote (yellow)
@ -55,5 +53,5 @@ PROMPT='${ret_status} ${user}%{$fg_bold[white]%}@${loc} %{$fg_bold[blue]%}%~%u
%{$fg_bold[white]%}❱%{$reset_color%} '
RPROMPT='$(git_prompt_ahead)%{$fg_bold[white]%}$(git_prompt_info)$(git_prompt_short_sha)$(git_prompt_status)%{$reset_color%}'
else
PROMPT='%n@%m: %~%u ${end} '
PROMPT='%n@%m: %~%u %# '
fi