X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=f01c5ff2e3b93c6eb8871a07485372ece8253caf;hb=0cc191ec23888f102fa6ab82b963e0bcfcaa2e79;hp=3647dd4e9ec1abee89a5e0d1b97232933ec50561;hpb=3261fa780735276a0d7b3064ae954d17f6e4cdbc;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 3647dd4..f01c5ff 100644 --- a/zsh/rc +++ b/zsh/rc @@ -1,6 +1,8 @@ # Zsh configuration file. +source_debug "sourcing ~/.zsh/rc" + # MISCELLANEOUS SETTINGS # Use Vi(m) style key bindings. @@ -9,8 +11,8 @@ bindkey -v # Be paranoid, new files are readable/writable by me only. umask 077 -# Make sure core dumps are created. -ulimit -c unlimited +# Disable beeps. +setopt nobeep # Prevent overwriting existing files with '> filename', use '>| filename' # (or >!) instead. @@ -31,11 +33,57 @@ setopt extendedglob setopt ignoreeof +# FUNCTION SETTINGS + +# Make sure every entry in $fpath is unique. +typeset -U fpath +# ~/.zsh/functions/completion is a symbolic link to the Completion directory +# of a Zsh CVS checkout. Use it to get the newest completions if available. +if [[ -d ~/.zsh/functions/completion ]]; then + fpath=(~/.zsh/functions/completion/*/*(/) $fpath) +fi +# Set correct fpath to allow loading my functions (including completion +# functions). +fpath=(~/.zsh/functions $fpath) +# Autoload my functions (except completion functions and hidden files). Thanks +# to caphuso from the Zsh example files for this idea. +if [[ -d ~/.zsh/functions ]]; then + autoload ${fpath[1]}/^_*(^/:t) +fi + +# Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At +# the moment only precmd() and preexec() 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. +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. + function precmd() { + for function in $precmd_functions; do + $function $@ + done + } + function preexec() { + for function in $preexec_functions; do + $function $@ + done + } +fi + +# Autoload add-zsh-hook to add/remove zsh hook functions easily. +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. -HISTSIZE=5000 -SAVEHIST=5000 +HISTSIZE=50000 +SAVEHIST=50000 HISTFILE=~/.zsh/history # Append to the history file instead of overwriting it and do it immediately # when a command is executed. @@ -43,15 +91,36 @@ setopt appendhistory setopt incappendhistory # If the same command is run multiple times store it only once in the history. setopt histignoredups -# Vim like completions of previous executed commands. -bindkey "^P" history-beginning-search-backward -bindkey "^N" history-beginning-search-forward +# 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 +# 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. +zle -N my-vi-history-beginning-search-backward +my-vi-history-beginning-search-backward() { + local not_at_beginning_of_line + if [[ $CURSOR -ne 0 ]]; then + not_at_beginning_of_line=yes + fi + zle history-beginning-search-backward -# PROMPT SETTINGS + # Start Vi-mode and stay at the same position (Vi-mode moves one left, + # this counters it). + zle vi-cmd-mode + if [[ -n $not_at_beginning_of_line ]]; then + zle vi-forward-char + fi +} +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 -# Autoload add-zsh-hook to add/remove zsh hook functions easily. -autoload -Uz add-zsh-hook + +# PROMPT SETTINGS # Use colorized output, necessary for prompts and completions. autoload -U colors && colors @@ -66,8 +135,18 @@ PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\ %(1j.%{${fg[yellow]}%}%j%{${fg[default]}%}.)%(2L.+.)%# \ %(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )" -# VCS_Info was added in 4.3.9. -if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then +# 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). +if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || + -d ~/.zsh/functions/vcs_info ]]; then + # Update fpath to allow loading the VCS_Info functions. + if [[ -d ~/.zsh/functions/vcs_info ]]; then + fpath=(~/.zsh/functions/vcs_info/ + ~/.zsh/functions/vcs_info/Backends + $fpath) + fi + # Allow substitutions and expansions in the prompt, necessary for # vcs_info. setopt promptsubst @@ -92,25 +171,47 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then add-zsh-hook precmd prompt_precmd # Display the vcs information in the right prompt. - RPROMPT='${vcs_info_msg_0_}' + 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. + else + RPROMPT='${vcs_info_msg_0_:- }' + fi fi -# When screen is used set the name of the window to the currently running -# program. +# When screen, xterm or rxvt is used set the name of the window to the +# currently running program. # # When a program is started preexec() sets the window's name to it; when it -# stops precmd() resets the windows' name to 'zsh'. -if [[ $TERM == screen ]]; then - # Set to a non empty value to reset the window name in the next precmd() - # call. - screen_name_reset=yes +# stops precmd() resets the window's name to 'zsh'. +# +# It works with screen, xterm and rxvt. +# +# 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. +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. + window_reset=yes + # Is set to a non empty value when the shell is running as root. + if [[ $(id -u) -eq 0 ]]; then + window_root=yes + fi - screen_preexec() { + window_preexec() { # Get the program name with its arguments. local program_name=$1 - # When sudo is used use real program name instead. + + # When sudo is used use real program name instead, but with an + # exclamation mark at the beginning (handled below). + local program_sudo= if [[ $program_name == sudo* ]]; then program_name=${program_name#sudo } + program_sudo=yes fi # Remove all arguments from the program name. program_name=${program_name%% *} @@ -118,7 +219,7 @@ if [[ $TERM == screen ]]; then # Ignore often used commands which are only running for a very short # time. This prevents a "blinking" name when it's changed to "cd" for # example and then some milliseconds later back to "zsh". - [[ $program_name == (cd*|ls|la|ll|clear) ]] && return + [[ $program_name == (cd*|ls|la|ll|clear|c) ]] && return # Change my shortcuts so the real name of the program is displayed. case $program_name in @@ -136,58 +237,109 @@ if [[ $TERM == screen ]]; then ;; esac + # Add an exclamation mark at the beginning if running with sudo or if + # running zsh as root. + if [[ -n $program_sudo || -n $window_root ]]; then + program_name=!$program_name + fi + + # Add an at mark at the beginning if running through ssh on a + # different computer. + if [[ -n $SSH_CONNECTION ]]; then + program_name="@$program_name" + fi + # Set the window name to the currently running program. - print -n "\ek$program_name\e\\" + window_title "$program_name" # Tell precmd() to reset the window name when the program stops. - screen_name_reset=yes + window_reset=yes } - screen_precmd() { + window_precmd() { # Abort if no window name reset is necessary. - [[ -z $screen_name_reset ]] && return + [[ -z $window_reset ]] && return # Reset the window name to 'zsh'. - print -n "\ekzsh\e\\" + 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" + fi + + # Prepend prefixes like in window_preexec(). + if [[ -n $SSH_CONNECTION ]]; then + window_title "@$name" + elif [[ -n $window_root ]]; then + window_title "!$name" + else + window_title $name + fi # Just reset the name, so no screen reset necessary for the moment. - screen_name_reset= + window_reset= + } + + # Sets the window title. Works with screen, xterm and rxvt. + window_title() { + if [[ $TERM == screen* ]]; then + print -n "\ek$1\e\\" + + elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then + print -n "\e]2;$1\e\\" + fi } # Add the preexec() and precmd() hooks. - add-zsh-hook preexec screen_preexec - add-zsh-hook precmd screen_precmd + add-zsh-hook preexec window_preexec + add-zsh-hook precmd window_precmd fi # COMPLETION SETTINGS -# Use new completion system. -autoload -U compinit && compinit # Load the complist module which provides additions to completion lists # (coloring, scrollable). zmodload zsh/complist +# Use new completion system, store dumpfile in ~/.zsh/cache to prevent +# cluttering of ~/. $fpath must be set before calling this. Thanks to Adlai in +# #zsh on Freenode (2009-08-07 21:05) for reminding me of the $fpath problem. +autoload -U compinit && compinit -d ~/.zsh/cache/zcompdump + +# Use cache to speed up completions. +zstyle ':completion:*' use-cache on +zstyle ':completion:*' cache-path ~/.zsh/cache + +# Complete arguments and fix spelling mistakes when possible. +zstyle ':completion:*' completer _complete _match _correct _approximate + # Make sure the list of possible completions is displayed after pressing # the first time. 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 -# Use cache to speed up completions. -zstyle ':completion:*' use-cache on -zstyle ':completion:*' cache-path ~/.zsh/cache # 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}' -# Ignore completion functions. -zstyle ':completion:*:functions' ignored-patterns '_*' -# Ignore parent directory. -zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd + # Use ls like colors for completions. zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS} + # Make completion lists scrollable so "do you wish to see all n possibilities" # is no longer displayed. zstyle ':completion:*' list-prompt '%p' +# Display group name (like 'external command', 'alias', etc.) when there are +# multiple matches in bold. +zstyle ':completion:*' format ' %B%d%b:' +# Display different types of matches separately. +zstyle ':completion:*' group-name '' + +# Ignore completion functions. +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 @@ -196,48 +348,60 @@ zstyle ':completion:*:unset:*' ignore-line yes zstyle ':completion:*:(hg|git)*:*' ignore-line yes -# ALIAS AND FUNCTION SETTINGS +# CUSTOM ALIASES AND FUNCTIONS -# Simplify calls to less, automatically redirects all output. -alias -g L='2>&1 | less' -# Simplify calls to colordiff, output is also piped through less. -alias -g D='2>&1 | colordiff L' -# Simplify calls to grep. -alias -g G='| grep' +# If ^C is pressed while typing a command, add it to the history so it can be +# easily retrieved later and then abort like ^C normally does. This is useful +# when I want to abort an command to do something in between and then finish +# typing the command. +# +# Thanks to Vadim Zeitlin for a fix (--) so lines +# starting with - don't cause errors. +TRAPINT() { + # Store the current buffer in the history. + zle && print -s -- $BUFFER -# Automatically use unified diffs. -alias diff='diff -u' + # Return the default exit code so zsh aborts the current command. + return $1 +} -# Display all files and use human readable sizes. -alias du='du -sh' +# 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 +# cases the E alias can be used as workaround. +exec 2>>(while read -r line; do + printf '\e[91m%s\e[0m\n' "$line" + print -n $'\0'; +done &) + +# Make sure aliases are expanded when using sudo. +alias sudo='sudo ' + +# Global aliases for often used commands in the command line. +alias -g E='2>&1' +alias -g L='E | less' +alias -g D='E | colordiff L' +alias -g G='| grep' +alias -g S='| sort' +alias -g U='| uniq' -# Multiple files given to Vim are opened in tabs, supported since Vim 7. -if [[ ${${${(f)"$(vim --version)"}[1]#VIM - Vi IMproved }%% *} == 7* ]]; then - alias vim='vim -p' -fi +# Make going up directories simple. +alias -g ...='../..' +alias -g ....='../../..' +alias -g .....='../../../..' # Shortcuts for often used programs. +alias c='clear' alias e='elinks' alias g='git' alias m='mutt' alias v='vim' alias vi='vim' -# Exit binding like in Vim; I sometimes confuse editor and shell. -alias :q='exit' - -# Edit the mercurial patch queue series file for the current mercurial -# repository in Vim. Also change Vim's pwd to the patches directory so other -# patches can easily be opened. -alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"' - -# Make going up directories simple. -alias -g ...='../..' -alias -g ....='../../..' -alias -g .....='../../../..' - -# Improved ls which displays the files in columns (-C), visualizes directories, -# links and other special files (-F) and pages everything through less (L). +# Improved ls which displays the files in columns (-C), visualizes +# directories, links and other special files (-F) and pages everything through +# less (L). # # If available use GNU ls with colorized output. If it isn't available use # normal ls which needs CLICOLOR_FORCE so it displays colors when used with a @@ -261,27 +425,102 @@ function ll() { la -l $* } -# If ^C is pressed while typing a command, add it to the history so it can be -# easily retrieved later and then abort like ^C normally does. This is useful -# when I want to abort an command to do something in between and then finish -# typing the command. -TRAPINT() { - # Store the current buffer in the history. - zle && print -s $BUFFER +# If the window naming feature is used (see above) then use ".zsh" (leading +# dot) as title name after running clear so it's clear to me that the window +# is empty. I open so much windows that I don't know in which I have something +# important. This helps me to remember which windows are empty (I run clear +# after I finished my work in a window). +if [[ -n $window_reset ]]; then + alias clear='clear; window_reset=yes; window_precmd reset' +fi - # Return the default exit code so zsh aborts the current command. - return $1 +# I sometimes confuse editor and shell, print a warning to prevent I exit the +# shell. +alias :q='echo "This is not Vim!" >&2' + +# Automatically use unified diffs. +alias diff='diff -u' + +# Display all files and use human readable sizes. +alias du='du -sh' + +# Use human readable sizes. +alias df='df -h' + +# Edit the mercurial patch queue series file for the current mercurial +# repository in Vim. Also change Vim's pwd to the patches directory so other +# patches can easily be opened. +alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"' + +# Display all branches (except stash) in gitk but only 200 commits as this is +# much faster. Also put in the background and disown. Thanks to sitaram in +# #git on Freenode (2009-04-20 15:51). +gitk() { + command gitk \ + --max-count=200 \ + $(git rev-parse --symbolic-full-name --remotes --branches) \ + $@ & + disown %command } +# Same for tig (except the disown part as it's no GUI program). +tig() { + command tig \ + --max-count=200 \ + $(git rev-parse --symbolic-full-name --remotes --branches) \ + $@ +} + -# Display TODOs stored in ~/.todo if this file exists. -todo() { - if [[ -f ~/.todo ]]; then - cat ~/.todo | $PAGER +# 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 + # Get running detached sessions. + session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }') + # Create a new session if none is running. + if [[ -z $session ]]; then + screen + # Reattach to a running session. + else + screen -r $session fi -} +fi + + +# OS SPECIFIC SETTINGS + +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 + # Store the current clipboard in CLIPBOARD before every command so it can + # be used in commands. + os_darwin_preexec() { + export CLIPBOARD="$(pbpaste)" + } + # Add the function as preexec hook. + add-zsh-hook preexec os_darwin_preexec + + # Initialize CLIPBOARD so it's available for completion directly after + # startup. + CLIPBOARD="" + export CLIPBOARD + + # Fetch current URL in clipboard with wget. + alias wnc='wget --no-proxy $CLIPBOARD' +fi -# Load rc file for current OS. -source_config ~/.zsh os rc $(uname) nolocal # Load rc file for current hostname (first part before a dot) or rc.local. source_config ~/.zsh host rc ${$(hostname)//.*/} + +source_debug "finished sourcing ~/.zsh/rc" + +# vim: ft=zsh