From ea8fc6bd971f594312e1572d3c17cb5502e13085 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Wed, 7 Nov 2012 14:52:40 +0100 Subject: [PATCH 1/1] zshrc: update --- dotfiles/zshrc | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 336bd92..8777989 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -1,3 +1,5 @@ +# sample by Peter Palfrader: http://svn.noreply.org/svn/weaselutils/trunk/dotfiles/zshrc + [ -r /etc/zsh/zprofile ] && source /etc/zsh/zprofile [ -r $HOME/.profile ] && source $HOME/.profile @@ -14,8 +16,6 @@ if [ -e $HOME/.bash_completion ]; then source $HOME/.bash_completion fi - - autoload colors zsh/terminfo if [[ "$terminfo[colors]" -ge 8 ]]; then colors @@ -70,10 +70,18 @@ setopt \ NO_HUP +for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do + eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}' + eval PR_LIGHT_$color='%{$fg[${(L)color}]%}' +done +PR_BOLD="%{$terminfo[bold]%}" +PR_NO_COLOUR="%{$terminfo[sgr0]%}" + HISTFILE=~/.zsh_history HISTSIZE=50000 SAVEHIST=50000 REPORTTIME=5 +TIMEFMT="$terminfo[bold]$fg[yellow]%J %U user %S sys %P cpu %*E total %M kB max$terminfo[sgr0]" autoload -Uz vcs_info && vcs_info zstyle ':vcs_info:*' enable git cvs svn hg @@ -81,26 +89,27 @@ zstyle ':vcs_info:*' use-prompt-escapes zstyle ':vcs_info:*' max-exports 1 -function setprompt() { - - for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do - eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}' - eval PR_LIGHT_$color='%{$fg[${(L)color}]%}' - done - PR_BOLD="%{$terminfo[bold]%}" - PR_NO_COLOUR="%{$terminfo[sgr0]%}" - +function setprompt() +{ + # default: " (%s)-[%b|%a]%u%c-" zstyle ':vcs_info:*' actionformats "${PR_YELLOW}%s:%b|%a${PR_NO_COLOUR} " + # default: " (%s)-[%b]%u%c-" zstyle ':vcs_info:*' formats "${PR_YELLOW}%s:%b${PR_NO_COLOUR} " setopt PROMPT_SUBST PROMPT='%(!.$PR_RED.$PR_GREEN)%n@%m $PR_BLUE%1~ %# $PR_NO_COLOUR' - RPROMPT='${vcs_info_msg_0_}$PR_CYAN?%?$PR_NO_COLOUR' + RPROMPT='${vcs_info_msg_0_}${PR_STUFF}' } setprompt -function precmd () { +function precmd () +{ + local exitstatus="${?}" + PR_STUFF=" " + if [[ 0 -ne "${exitstatus}" ]] ; then + PR_STUFF="${PR_RED}RET ${exitstatus}${PR_NO_COLOUR}" + fi vcs_info } -- 2.30.2