X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=cfd3f432c4a76247e64d4e301a619d7d00906c7c;hb=eeab5490994eefc79d00c92d04ddcc31f64c6426;hp=50291513fb67ca0aa7490dbfe22d82446354ebcd;hpb=38194a6b33b36e2137c0ac95c1eaf0606e072d24;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 5029151..cfd3f43 100644 --- a/zsh/rc +++ b/zsh/rc @@ -5,9 +5,6 @@ source_debug "sourcing ~/.zsh/rc" # MISCELLANEOUS SETTINGS -# Use Vi(m) style key bindings. -bindkey -v - # Be paranoid, new files are readable/writable by me only. umask 077 @@ -33,6 +30,22 @@ setopt extendedglob setopt ignoreeof +# KEY BINDINGS + +# Not all bindings are done here, only those not specific to a given section. + +# 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 -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D' +# Also not in Vi mode. +bindkey -a -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D' + + # FUNCTION SETTINGS # Make sure every entry in $fpath is unique. @@ -52,7 +65,7 @@ if [[ -d ~/.zsh/functions ]]; then fi # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At -# the moment only precmd() and preexec() are simulated. +# the moment only precmd(), preexec() and chpwd() are simulated. # # At least 4.3.4 (not sure about later versions) has an error in add-zsh-hook # so the compatibility version is used there too. @@ -60,7 +73,8 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then # Provide add-zsh-hook which was added in 4.3.4. fpath=(~/.zsh/functions/compatibility $fpath) - # Run all functions defined in the ${precmd,preexec}_functions arrays. + # Run all functions defined in the ${precmd,preexec,chpwd}_functions + # arrays. function precmd() { for function in $precmd_functions; do $function $@ @@ -71,6 +85,11 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then $function $@ done } + function chpwd() { + for function in $chpwd_functions; do + $function $@ + done + } fi # Autoload add-zsh-hook to add/remove zsh hook functions easily. @@ -79,6 +98,7 @@ autoload -Uz add-zsh-hook # Load zmv (zsh move) which is powerful to rename files. autoload zmv + # HISTORY SETTINGS # Use history and store it in ~/.zsh/history. @@ -93,7 +113,7 @@ setopt incappendhistory setopt histignoredups # Vim like completions of previous executed commands (also enter Vi-mode). If # called at the beginning it just recalls old commands (like cursor up), if -# called after typing something only lines starting with the typed are +# called after typing something, only lines starting with the typed are # returned. Very useful to get old commands quickly. Thanks to Mikachu in #zsh # on Freenode (2010-01-17 12:47) for the information how to a use function # with bindkey. @@ -113,11 +133,11 @@ my-vi-history-beginning-search-backward() { zle vi-forward-char fi } -bindkey "^P" my-vi-history-beginning-search-backward -bindkey -a "^P" history-beginning-search-backward # binding for Vi-mode +bindkey '^P' my-vi-history-beginning-search-backward +bindkey -a '^P' history-beginning-search-backward # binding for Vi-mode # Here only Vi-mode is necessary as ^P enters Vi-mode and ^N only makes sense # after calling ^P. -bindkey -a "^N" history-beginning-search-forward +bindkey -a '^N' history-beginning-search-forward # PROMPT SETTINGS @@ -125,7 +145,8 @@ 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]}%}" @@ -134,7 +155,8 @@ 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 and a + if this shell is running inside another shell. +# 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 \ @@ -219,8 +241,13 @@ unset red blue green yellow default # # If a command is run with sudo or if the shell is running as root then a ! is # added at the beginning of the command to make this clear. If a command is -# running on a different computer with ssh a @ is added at the beginning. This -# only works if the .zshrc on the server also uses this command. +# running on a different computer with ssh a @ is added at the beginning. If +# 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. @@ -260,7 +287,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then m) program_name=mutt ;; - v|vi) + v) program_name=vim ;; esac @@ -275,6 +302,12 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then # different computer. if [[ -n $SSH_CONNECTION ]]; then program_name="@$program_name" + + # If screen is running in SSH then display "@:hostname" as title + # in the term/outer screen. + if [[ $program_name == @screen ]]; then + program_name="@:${$(hostname)//.*/}" + fi fi # Set the window name to the currently running program. @@ -289,35 +322,39 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then [[ -z $window_reset ]] && return # Reset the window name to 'zsh'. - local name="zsh" + local name=zsh # If the function was called with an argument then reset the window # name to '.zsh' (used by clear alias). if [[ -n $1 ]]; then - name=".zsh" + name=.zsh 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= } # Sets the window title. Works with screen, xterm and rxvt. - window_title() { - if [[ $TERM == screen* ]]; then + if [[ $TERM == screen* ]]; then + window_title() { print -n "\ek$1\e\\" - - elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then + } + elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then + window_title() { print -n "\e]2;$1\e\\" - fi - } + } + else + # Fallback if another TERM is used. + window_title() { } + fi # Add the preexec() and precmd() hooks. add-zsh-hook preexec window_preexec @@ -347,7 +384,7 @@ zstyle ':completion:*' completer _complete _match _correct _approximate setopt nolistambiguous # Allow completions in the middle of a text, i.e. "/usr/bin/whatever" # completes like "/usr/bin/". Useful when adding new options to commands. -bindkey "^I" expand-or-complete-prefix +bindkey '^I' expand-or-complete-prefix # Try uppercase if the currently typed string doesn't match. This allows # typing in lowercase most of the time and completion fixes the case. zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' @@ -368,12 +405,14 @@ 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 # CUSTOM ALIASES AND FUNCTIONS @@ -384,22 +423,25 @@ 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 the default exit code so Zsh aborts the current command. return $1 } # Colorize stderr. 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 some interactive stderr output, but in those +# 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. -exec 2>>(while read -r line; do - printf '\e[91m%s\e[0m\n' "$line" +exec 2>>(while read -r -k -u 0 line; do + printf '\e[91m%s\e[0m' "$line"; print -n $'\0'; done &) @@ -418,6 +460,8 @@ alias -g D='E | colordiff L' alias -g G='| grep' alias -g S='| sort' alias -g U='| uniq' +alias -g H='| head' +alias -g T='| tail' # Make going up directories simple. alias -g ...='../..' @@ -454,14 +498,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" + 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() { @@ -489,18 +535,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