X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=fbf9aea5196ba5582b5c9738ae85adab1c950f45;hb=614f9080ac810a2f4c0a5244bca856f3358e625e;hp=f38761f5f107c7d97a2ebbf47b51c61f05b55c30;hpb=74e9edd1063220be05ea1d9d430cdf430dac09f9;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index f38761f..fbf9aea 100644 --- a/zsh/rc +++ b/zsh/rc @@ -1,5 +1,20 @@ # Zsh configuration file. +# Copyright (C) 2011-2012 Simon Ruderich +# +# This file is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this file. If not, see . + source_debug ". ~/.zsh/rc" @@ -37,8 +52,9 @@ setopt ignoreeof # Use Vi(m) style key bindings. bindkey -v -# Also use jj to exit insert mode. +# Use jj and jk to exit insert mode. bindkey 'jj' vi-cmd-mode +bindkey 'jk' 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' @@ -77,17 +93,17 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then # arrays. function precmd() { for function in $precmd_functions; do - $function $@ + $function "$@" done } function preexec() { for function in $preexec_functions; do - $function $@ + $function "$@" done } function chpwd() { for function in $chpwd_functions; do - $function $@ + $function "$@" done } fi @@ -95,7 +111,7 @@ 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. +# Load zmv (zsh move) which is a powerful file renamer. autoload -Uz zmv @@ -111,12 +127,14 @@ setopt appendhistory setopt incappendhistory # If the same command is run multiple times store it only once in the history. setopt histignoredups +# Don't add lines starting with a space to the history. +setopt histignorespace # 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 CET) for the information how to a use function -# with bindkey. +# called after typing something, only lines starting with the typed text are +# returned. Very useful to get old commands quickly - in addition to the +# history commands (!..). Thanks to Mikachu in #zsh on Freenode (2010-01-17 +# 12:47 CET) 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 @@ -139,6 +157,15 @@ bindkey -a '^P' history-beginning-search-backward # binding for Vi-mode # after calling ^P. bindkey -a '^N' history-beginning-search-forward +# Automatically push cd-ed directories on the directory stack. +setopt autopushd +# Don't push duplicates on the directory stack. +setopt pushdignoredups +# Exchange the meaning of + and - when specifying a directory on the stack. +# This way cd - lists the last used directory first, which is more +# natural because cd - goes to the last directory. +setopt pushdminus + # PROMPT SETTINGS @@ -149,7 +176,7 @@ autoload -Uz colors && colors zmodload zsh/datetime # Some shortcuts for colors. The %{...%} tells zsh that the data in between -# doesn't need any space, necessary for correct prompt draw. +# doesn't need any space, necessary for correct prompt drawing. local red="%{${fg[red]}%}" local blue="%{${fg[blue]}%}" local green="%{${fg[green]}%}" @@ -174,7 +201,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || zstyle ':vcs_info:*' enable git hg # Check the repository for changes so they can be used in %u/%c (see # below). This comes with a speed penalty for bigger repositories. - zstyle ':vcs_info:*' check-for-changes true + zstyle ':vcs_info:*' check-for-changes yes # Set style of vcs_info display. The current branch (green) and VCS (blue) # is displayed. If there is an special action going on (merge, rebase) @@ -202,13 +229,13 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) || zstyle ':vcs_info:*' unstagedstr '¹' zstyle ':vcs_info:*' stagedstr '²' - # Default to running vcs_info. If possible we prevent running it later for + # Default to run 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 + 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. @@ -248,16 +275,15 @@ else 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. +# working directory is displayed, on the right vcs_info (if available) and the +# current time in hex. 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. -# -# The current time is display in hex in the right 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 @@ -306,7 +332,8 @@ add-zsh-hook precmd prompt_precmd # currently running program. # # When a program is started preexec() sets the window's name to it; when it -# stops precmd() resets the window's name to 'zsh'. +# stops precmd() resets the window's name to 'zsh'. 'fg' is supported and sets +# the window's name to the resumed job. # # It works with screen, xterm and rxvt. # @@ -339,6 +366,14 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then program_name=${program_name#sudo } program_sudo=yes fi + + # Replace fg with the resumed job name. + if [[ $program_name == fg ]]; then + program_name=${jobtexts[%+]} + elif [[ $program_name == fg* ]]; then + program_name=${jobtexts[${program_name#fg }]} + fi + # Remove all arguments from the program name. program_name=${program_name%% *} @@ -444,8 +479,8 @@ fi # COMPLETION SETTINGS -# Load the complist module which provides additions to completion lists -# (coloring, scrollable). +# Load the complist module which provides additional features to completion +# lists (coloring, scrolling). 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 @@ -453,35 +488,70 @@ zmodload zsh/complist # problem. autoload -Uz compinit && compinit -d ~/.zsh/cache/zcompdump -# Use cache to speed up completions. -zstyle ':completion:*' use-cache on +# Use cache to speed up some slow completions (dpkg, perl modules, etc.). +zstyle ':completion:*' use-cache yes 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. +# Let the completion system handle all completions, including expanding of +# shell wildcards (which is handled by other shell mechanisms if the default +# expand-or-complete is used). +bindkey '^I' complete-word +# If there are multiple matches after pressing always display them +# immediately without requiring another . a completes to aa and +# lists aaa, aab, aac as possible completions if the directory contains aaa, +# aab, aac, bbb instead of only completing to aa. 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 -# 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}' +# Support completions in the middle of a word, without this option zsh jumps +# to the end of the word before the completion process begins. Is required for +# the _prefix completer. +setopt completeinword + +zstyle ':completion:::::' completer \ + _expand _complete _prefix _ignored _approximate -# Use ls like colors for completions. +# Try uppercase if the currently typed string doesn't match. This allows +# typing in lowercase most of the time and completion fixes the case. Don't +# perform these fixes in _approximate to prevent it from changing the input +# too much. Thanks to the book "From Bash to Z Shell" page 249. +zstyle ':completion:*:(^approximate):*' matcher-list 'm:{a-z}={A-Z}' + +# Allow one mistake per three characters. Thanks to the book "From Bash to Z +# Shell" page 248. +zstyle -e ':completion:*:approximate:*' max-errors \ + 'reply=( $(( ($#PREFIX + $#SUFFIX) / 3 )) )' + +# Expand shell wildcards to all matching files after . echo * +# results in a b c if the directory contains the files a, b, c. Thanks to the +# book "From Bash to Z Shell" page 246. +zstyle ':completion:*:expand:*' tag-order all-expansions +# Keep prefixes unexpanded if possible: $HOME/ doesn't expand $HOME, +# while $HOME does. +zstyle ':completion:*:expand:*' keep-prefix yes + +# When completing multiple path components display all matching ambiguous +# components. For example /u/s/d/r/README lists all matching READMEs +# instead of just the matching paths up to the r/ component. Can be slow if +# there are many matching files. +zstyle ':completion:*' list-suffixes yes + +# 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:' +# is no longer displayed. Display current position in percent (%p). +zstyle ':completion:*:default' list-prompt '%p' +# Display group name (%d) (like 'external command', 'alias', etc.), in bold. +# Also display a message if _approximate found errors and if no matches were +# found. +zstyle ':completion:*' format ' %B%d%b:' +zstyle ':completion:*:corrections' format ' %B%d%b (errors: %e)' +zstyle ':completion:*:warnings' format ' %Bno matches for %d%b' # Display different types of matches separately. zstyle ':completion:*' group-name '' +# Separate man pages by section. +zstyle ':completion:*' separate-sections yes + # Don't draw trailing / in bold (new in zsh 4.3.11). Thanks to Mikachu in #zsh # on Freenode for the fix (2010-12-17 13:46 CET). zle_highlight=(suffix:none) @@ -490,22 +560,25 @@ zle_highlight=(suffix:none) zstyle ':completion:*:functions' ignored-patterns '_*' # Ignore parent directory. zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd -# 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 +# Always complete file names only once in the current line. This makes it easy +# to complete multiple file names because I can just press tab to get all +# possible values. Otherwise I would have to skip the first value again and +# again. Thanks to Mikachu in #zsh on Freenode (2011-08-11 14:42 CEST) for the +# hint to use other. other is necessary so prefix lists both prefix and +# prefixrest if the directory contains prefix and prefixrest. +zstyle ':completion:*:all-files' ignore-line other # 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 +zstyle ':completion:*:(mv|cp):all-files' ignore-line no + # Don't complete ./config.* files, this makes running ./configure much # simpler. Thanks to Nomexous in #zsh on Freenode (2010-03-16 01:54 CET) zstyle ':completion:*:*:-command-:*' ignored-patterns './config.*' - # Don't complete unwanted files with Vim. Thanks to Nomexous in #zsh on -# Freenode (2010-06-06 04:54 CEST). See below to complete them. -zstyle ':completion:*:*:vim:*:all-files' ignored-patterns '*.aux' '*.log' \ - '*.pdf' '*.class' +# Freenode (2010-06-06 04:54 CEST). See below for a way to complete them. +zstyle ':completion:*:*:vim:*:all-files' ignored-patterns \ + '*.aux' '*.log' '*.pdf' \ + '*.class' # Provide a fallback completer which always completes files. Useful when Zsh's # completion is too "smart". Thanks to Frank Terbeck @@ -566,22 +639,19 @@ if [[ -n $window_reset ]]; then alias clear='clear; window_reset=yes; window_precmd reset' fi + +# CUSTOM COMMANDS + # 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). +# much faster. Also put in the background and disown. Thanks to drizzd in #git +# on Freenode (2010-04-03 17:55 CEST). gitk() { - command gitk \ - --max-count=200 \ - $(git rev-parse --symbolic-full-name --remotes --branches) \ - $@ & + command gitk --max-count=200 --branches --remotes --tags "$@" & 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) \ - $@ + command tig --max-count=200 --branches --remotes --tags "$@" } # Pipe output through less. @@ -589,10 +659,30 @@ tree() { command tree -C "$@" | less } -# Automatically disown. -xpdf() { - command xpdf "$@" & - disown %command +# Choose the "best" PDF viewer available: zathura, then xpdf. Also setup +# completion for `pdf`. +if (( $+commands[zathura] )); then + pdf() { + command zathura "$@" 2>/dev/null & + disown %command + } + # No completion for zathura yet. + compdef _xpdf pdf +elif (( $+commands[xpdf] )); then + pdf() { + command xpdf "$@" 2>/dev/null & + disown %command + } + compdef _xpdf pdf +fi + +# GHCI doesn't use readline, force it if rlwrap is available. +(( $+commands[rlwrap] )) && ghci() { + command rlwrap \ + --always-readline --complete-filenames -t dumb \ + --histsize 5000 \ + --file ~/.shell/rlwrap/ghci \ + ghci "$@" 2>&1 }