diff options
| author | Hendrik Jaeger <henk@frustcomp> | 2014-11-11 00:42:55 +0100 |
|---|---|---|
| committer | Hendrik Jaeger <henk@frustcomp> | 2014-11-11 00:42:55 +0100 |
| commit | bacbcecaa0bce6e2286cb1c031131149b7130a46 (patch) | |
| tree | d6928469d467e765981d31a9e0dad424914d13ff | |
| parent | c6f847b4678c616bd09ebfcf3980ffbabef10caf (diff) | |
Added vcs_info to prompt
modified: .zsh_functions
modified: .zshrc
| -rw-r--r-- | .zsh_functions | 44 | ||||
| -rw-r--r-- | .zshrc | 10 |
2 files changed, 31 insertions, 23 deletions
diff --git a/.zsh_functions b/.zsh_functions index d4818ec..858e7c5 100644 --- a/.zsh_functions +++ b/.zsh_functions @@ -17,27 +17,35 @@ function ESC_print () { } preexec () { - if [[ "$TERM" == screen* ]] ; then - local CMD=${1[(wr)^(*=*|sudo|ssh|evince|-*)]} - ESC_print ${CMD} - fi - case $TERM in - (xterm*|rxvt*) - set_title "${(%):-"%n@%m:"}" "$1" - ;; - esac + case $TERM in + (xterm*|rxvt*) + set_title "${(%):-"%n@%m:"}" "$1" + ;; + (screen*) + local CMD=${1[(wr)^(*=*|sudo|ssh|evince|-*)]} + ESC_print ${CMD} + ;; + esac } precmd () { - if [[ $TERM == screen* ]] ; then - ESC_print "zsh" - fi - - case $TERM in - (xterm*|rxvt*) - set_title ${(%):-"%n@%m: %~"} - ;; - esac + case $TERM in + (xterm*|rxvt*) + set_title ${(%):-"%n@%m: %~"} + ;; + (screen*) + ESC_print "zsh" + ;; + esac + + vcs_info + if [[ -n ${vcs_info_msg_0_} ]]; then + local HENKSPROMPT="%(0?..%F{red}E%?%f )%(1j.%F{yellow}J%j%f .)%(3L.%F{yellow}L%L%f .)%3~ %F{green}$VCSH_REPO_NAME%f%F{yellow}${vcs_info_msg_0_}%f%# " + PS1="$HENKSPROMPTHEADER$HENKSPROMPT" + else + local HENKSPROMPT="%(0?..%F{red}E%?%f )%(1j.%F{yellow}J%j%f .)%(3L.%F{yellow}L%L%f .)%3~ %F{green}$VCSH_REPO_NAME%f%F{yellow}${vcs_info_msg_0_}%f%# " + PS1="$HENKSPROMPTHEADER$HENKSPROMPT" + fi } function vifind () { @@ -1,4 +1,6 @@ -. ~/.zshcomprc +autoload -Uz vcs_info + +. ~/.zsh_comprc . ~/.zsh_functions . ~/.zsh_aliases . ~/.zsh_local @@ -9,11 +11,9 @@ SAVEHIST=3000 REPORTTIME=10 -PS1="%F{red}%D{%A}%f %F{green}%D{%F %T Week %V}%f %F{blue}%D{Epoch %s}%f %F{yellow}%n@%m%f -%j %3~%# " -PATH=~/bin:~/usr/bin:~/usr/local/bin:$PATH +HENKSPROMPTHEADER=$'%F{red}%D{%a}%f %F{green}%D{%F %T Wk %V}%f %F{blue}%D{%s}%f %F{yellow}%n@%m%f\n' -PASSWORD_STORE_DIR=. +PATH=~/bin:~/usr/bin:~/usr/local/bin:$PATH setopt AUTO_CD setopt CHASE_LINKS |