X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=1f218f7b2f6eb2a7b898c75f14142f130930fab2;hb=18770ad042ddba58f8bb1b1028430b2c7061a4e9;hp=f63535523ce90fd170c315ef3ade1ded34ff67c9;hpb=7aa8877e79dfbf5cc22e856c6a1bb8c26083b7ca;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index f635355..1f218f7 100644 --- a/zsh/rc +++ b/zsh/rc @@ -37,24 +37,13 @@ setopt ignoreeof # Use Vi(m) style key bindings. bindkey -v +# Also use jj to exit insert mode. +bindkey 'jj' vi-cmd-mode + # I don't need the arrow keys, I use ^N and ^P for this (see below). -bindkey -M viins -r '^[OA' -bindkey -M viins -r '^[OB' -bindkey -M viins -r '^[OC' -bindkey -M viins -r '^[OD' -bindkey -M viins -r '^[[A' -bindkey -M viins -r '^[[B' -bindkey -M viins -r '^[[C' -bindkey -M viins -r '^[[D' +bindkey -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D' # Also not in Vi mode. -bindkey -M vicmd -r '^[OA' -bindkey -M vicmd -r '^[OB' -bindkey -M vicmd -r '^[OC' -bindkey -M vicmd -r '^[OD' -bindkey -M vicmd -r '^[[A' -bindkey -M vicmd -r '^[[B' -bindkey -M vicmd -r '^[[C' -bindkey -M vicmd -r '^[[D' +bindkey -a -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D' # FUNCTION SETTINGS @@ -156,23 +145,14 @@ bindkey -a '^N' history-beginning-search-forward # Use colorized output, necessary for prompts and completions. autoload -U colors && colors -# Some shortcuts for colors. +# Some shortcuts for colors. The %{...%} tells zsh that the data in between +# doesn't need any space, necessary for correct prompt draw. local red="%{${fg[red]}%}" local blue="%{${fg[blue]}%}" local green="%{${fg[green]}%}" local yellow="%{${fg[yellow]}%}" local default="%{${fg[default]}%}" -# Set the default prompt. The current host and working directory is displayed, -# the exit code of the last command if it wasn't 0, the number of running jobs -# if not 0. -# -# The prompt is in green and blue to make easily detectable, the error exit -# code in red and bold and the job count in yellow. -PROMPT="$green%B%m%b$default:$blue%B%~%b$default \ -%(1j.$yellow%j$default.)%# \ -%(?..($red%B%?%b$default%) )" - # vcs_info was added in 4.3.9 but it works in earlier versions too. So load it # if the necessary files are available in ~/.zsh/functions/vcs_info (often a # symbolic link to current checkout of Zsh's sources). @@ -185,9 +165,6 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || $fpath) fi - # Allow substitutions and expansions in the prompt, necessary for - # vcs_info. - setopt promptsubst # Load vcs_info to display information about version control repositories. autoload -Uz vcs_info # Only look for git and mercurial repositories; the only I use. @@ -222,24 +199,103 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || zstyle ':vcs_info:*' unstagedstr '¹' zstyle ':vcs_info:*' stagedstr '²' - # Call vcs_info as precmd before every prompt. - prompt_precmd() { - vcs_info + # Default to running vcs_info. If possible we prevent running it later for + # speed reasons. If set to a non empty value vcs_info is run. + FORCE_RUN_VCS_INFO=1 + + # Cache system inspired by Bart Trojanowski + # (http://jukie.net/~bart/blog/pimping-out-zsh-prompt). + #zstyle ':vcs_info:*+pre-get-data:*' hooks pre-get-data + +vi-pre-get-data() { + # Only Git and Mercurial support and need caching. Abort if any other + # VCS is used. + [[ "$vcs" != git && "$vcs" != hg ]] && return + + # If the shell just started up or we changed directories (or for other + # custom reasons) we must run vcs_info. + if [[ -n $FORCE_RUN_VCS_INFO ]]; then + FORCE_RUN_VCS_INFO= + return + fi + + # Don't run vcs_info by default to speed up the shell. + ret=1 + # If a git/hg command was run then run vcs_info as the status might + # need to be updated. + case "$(fc -ln $(($HISTCMD-1)))" in + git* | g\ *) + ret=0 + ;; + hg*) + ret=0 + ;; + esac + } + + # Must run vcs_info when changing directories. + prompt_chpwd() { + FORCE_RUN_VCS_INFO=1 } - add-zsh-hook precmd prompt_precmd - - # Display the VCS information in the right prompt. - if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then - RPROMPT='${vcs_info_msg_0_}' - # There is a bug in Zsh below 4.3.9 which displays a wrong symbol when - # ${vcs_info_msg_0_} is empty. Provide a workaround for those versions, - # thanks to Frank Terbeck for it. + add-zsh-hook chpwd prompt_chpwd + + # Used by prompt code below to determine if vcs_info should be run. + RUN_VCS_INFO=1 +else + RUN_VCS_INFO= +fi + +# Set the prompt. A two line prompt is used. On the top left the current +# working directory is displayed, on the right vcs_info (if available). On the +# bottom left current user name and host is shown, the exit code of the last +# command if it wasn't 0, the number of running jobs if not 0. +# +# The prompt is in green and blue to make easily detectable, the error exit +# code in red and bold and the job count in yellow. +# +# Thanks to Adam's prompt for the basic idea of this prompt. +prompt_precmd() { + # Regex to remove elements which take no space. Used to calculate the + # width of the top prompt. Thanks to Bart's and Adam's prompt code in + # Functions/Prompts/prompt_*_setup. + local zero='%([BSUbfksu]|([FB]|){*})' + + # Call vcs_info before every prompt. + if [[ -n $RUN_VCS_INFO ]]; then + vcs_info else - RPROMPT='${vcs_info_msg_0_:- }' + vcs_info_msg_0_= fi -fi -unset red blue green yellow default + local width width_left width_right + local top_left top_right + + # Display vcs_info (if used) on the right in the top prompt. + top_right="${vcs_info_msg_0_}" + width_right=${#${(S%%)top_right//$~zero/}} + # Remove vcs_info if it would get too long. + if [[ $(( COLUMNS - 4 - 1 - width_right )) -lt 0 ]]; then + top_right= + width_right=0 + fi + + # Display current directory on the left in the top prompt. Truncate the + # directory if necessary. + width=$(( COLUMNS - 4 - 1 - width_right )) + top_left=".-$default%b($yellow%$width<..<%~%<<$default)%B$blue" + + # Calculate the width of the top prompt to fill the middle with "-". + width_left=${#${(S%%)top_left//$~zero/}} + width_right=${#${(S%%)top_right//$~zero/}} + width=$(( COLUMNS - width_left - width_right )) + + PROMPT="$blue%B$top_left${(l:$width::-:)}%b$default$top_right +$blue%B'%b$default\ +$green%B%n%b$default@$green%B%m%b$default %(1j.$yellow%j$default.)%# \ +%(?..($red%B%?%b$default%) )" + +} +add-zsh-hook precmd prompt_precmd + # When screen, xterm or rxvt is used set the name of the window to the # currently running program. @@ -255,6 +311,9 @@ unset red blue green yellow default # screen is running on the remote machine instead of @screen @:hostname # (hostname replaced by the machine's hostname) is displayed. This only works # if the .zshrc on the server also uses this command. +# +# screen* is necessary as `screen` uses screen.linux for example for a linux +# console. if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then # Is set to a non empty value to reset the window name in the next # precmd() call. @@ -294,7 +353,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then m) program_name=mutt ;; - v|vi) + v) program_name=vim ;; esac @@ -314,6 +373,9 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then # in the term/outer screen. if [[ $program_name == @screen ]]; then program_name="@:${$(hostname)//.*/}" + # Use "@:!hostname" for root screens. + elif [[ $program_name == @!screen ]]; then + program_name="@:!${$(hostname)//.*/}" fi fi @@ -337,13 +399,13 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then fi # Prepend prefixes like in window_preexec(). + if [[ -n $window_root ]]; then + name="!$name" + fi if [[ -n $SSH_CONNECTION ]]; then - window_title "@$name" - elif [[ -n $window_root ]]; then - window_title "!$name" - else - window_title $name + name="@$name" fi + window_title $name # Just reset the name, so no screen reset necessary for the moment. window_reset= @@ -358,11 +420,18 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then window_title() { print -n "\e]2;$1\e\\" } + else + # Fallback if another TERM is used. + window_title() { } fi # Add the preexec() and precmd() hooks. add-zsh-hook preexec window_preexec add-zsh-hook precmd window_precmd +else + # Fallback if another TERM is used, necessary to run screen (see below in + # "RUN COMMANDS"). + window_preexec() { } fi @@ -409,12 +478,21 @@ zstyle ':completion:*' group-name '' zstyle ':completion:*:functions' ignored-patterns '_*' # Ignore parent directory. zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd -# When unsetting variables make sure every variable name is only suggested -# once. -zstyle ':completion:*:unset:*' ignore-line yes -# When working with Mercurial and Git don't complete the same file multiple -# times. Very useful when completing file names. -zstyle ':completion:*:(hg|git)*:*' ignore-line yes +# Always complete one value (file name) only once in the current line. This +# makes it easy to complete multiple values because I can just press tab to +# get all possible values. Otherwise I would have to skip the first value +# again and again. +zstyle ':completion:*' ignore-line yes +# Except for mv and cp, because I often want to use to similar names, so I +# complete to the same and change it. +zstyle ':completion:*:(mv|cp):*' ignore-line no + +# Provide a fallback completer which always completes files. Useful when Zsh's +# completion is too "smart". Thanks to Frank Terbeck +# (http://www.zsh.org/mla/users/2009/msg01038.html). +zle -C complete-files complete-word _generic +zstyle ':completion:complete-files:*' completer _files +bindkey '^F' complete-files # CUSTOM ALIASES AND FUNCTIONS @@ -425,21 +503,23 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes # typing the command. # # Thanks to Vadim Zeitlin for a fix (--) so lines -# starting with - don't cause errors. +# starting with - don't cause errors; and to Nadav Har'El +# for a fix (-r) to handle whitespace/quotes +# correctly, both on the Zsh mailing list. TRAPINT() { # Store the current buffer in the history. - zle && print -s -- $BUFFER + zle && print -s -r -- $BUFFER # Return the default exit code so Zsh aborts the current command. return $1 } -# Colorize stderr. Very useful when looking for errors. Thanks to +# Colorize stderr in red. Very useful when looking for errors. Thanks to # http://gentoo-wiki.com/wiki/Zsh for the basic script and Mikachu in #zsh on # Freenode (2010-03-07 04:03) for some improvements (-r, printf). It's not yet # perfect and doesn't work with su and git for example, but it can handle most -# interactive output quite well (even with no trailing new line) and in those -# cases the E alias can be used as workaround. +# interactive output quite well (even with no trailing new line) and in cases +# it doesn't work, the E alias can be used as workaround. exec 2>>(while read -r -k -u 0 line; do printf '\e[91m%s\e[0m' "$line"; print -n $'\0'; @@ -498,14 +578,16 @@ tig() { # OS SPECIFIC SETTINGS -if [[ $(uname) == Linux ]]; then +local uname=$(uname) + +if [[ $uname == Linux ]]; then # Settings when creating Debian packages. DEBEMAIL=simon@ruderich.org export DEBEMAIL DEBFULLNAME='Simon Ruderich' export DEBFULLNAME -elif [[ $(uname) == Darwin ]]; then # Mac OS X +elif [[ $uname == Darwin ]]; then # Mac OS X # Store the current clipboard in CLIPBOARD before every command so it can # be used in commands. os_darwin_preexec() { @@ -533,18 +615,20 @@ source_config ~/.zsh host rc ${$(hostname)//.*/} # RUN COMMANDS # If not already in screen reattach to a running session or create a new one. -# -# screen* is necessary as `screen` uses screen.linux for example for a linux -# console which would otherwise cause an infinite loop. -if [[ $TERM != screen* && $TERM != 'dumb' ]]; then +# This also starts screen one a remote server when connecting through ssh. +if [[ $TERM != dumb && -z $STY ]]; then # Get running detached sessions. session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }') + + # As we exec later we have to set the title here. + window_preexec "screen" + # Create a new session if none is running. if [[ -z $session ]]; then - screen + exec screen # Reattach to a running session. else - screen -r $session + exec screen -r $session fi fi