X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=inline;f=zsh%2Frc;h=e2f7f9ccea2b86620aa9ffe62c8070ff5065f480;hb=8bae2dfd3bcedce28e8e1d86d878cc3eaa83e21f;hp=4626513a1203a81aa9ae05bac6030ffb0164fd94;hpb=c37517624cb225ecbc5ea8b2fe2d2f12b828a9e8;p=config%2Fdotfiles.git
diff --git a/zsh/rc b/zsh/rc
index 4626513..e2f7f9c 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"
@@ -67,35 +82,26 @@ fi
# Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At
# 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.
-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)
-
+if [[ $ZSH_VERSION != (4.3.<4->*|4.<4->*|<5->*) ]]; then
# Run all functions defined in the ${precmd,preexec,chpwd}_functions
# 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
-# Autoload add-zsh-hook to add/remove zsh hook functions easily.
-autoload -Uz add-zsh-hook
-
# Load zmv (zsh move) which is a powerful file renamer.
autoload -Uz zmv
@@ -112,6 +118,8 @@ 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 text are
@@ -169,7 +177,7 @@ local default="%{${fg[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).
-if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
+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
@@ -190,7 +198,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
# is displayed. If there is an special action going on (merge, rebase)
# it's also displayed (red). Also display if there are unstaged or staged
# (%u/%c) changes.
- if [[ $ZSH_VERSION == (4.3.<11->|4.<4->*|<5->*) ||
+ if [[ $ZSH_VERSION == (4.3.<11->*|4.<4->*|<5->*) ||
-d ~/.zsh/functions/vcs_info ]]; then
zstyle ':vcs_info:*' formats \
"($green%b%u%c$default:$blue%s$default)"
@@ -249,7 +257,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
prompt_chpwd() {
FORCE_RUN_VCS_INFO=1
}
- add-zsh-hook chpwd prompt_chpwd
+ chpwd_functions+=(prompt_chpwd)
# Used by prompt code below to determine if vcs_info should be run.
RUN_VCS_INFO=1
@@ -308,23 +316,24 @@ $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
+precmd_functions+=(prompt_precmd)
-# When screen, xterm or rxvt is used set the name of the window to the
+# When screen, tmux, 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 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.
+# It works with screen, tmux, 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. 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/tmux is running on the remote machine instead of @screen @:hostname
+# (or @tmux ..; 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.
@@ -348,6 +357,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%% *}
@@ -385,10 +402,10 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
# If screen is running in SSH then display "@:hostname" as title
# in the term/outer screen.
- if [[ $program_name == @screen ]]; then
+ if [[ $program_name == @screen || $program_name == @tmux ]]; then
program_name="@:${HOST//.*/}"
# Use "@:!hostname" for root screens.
- elif [[ $program_name == @!screen ]]; then
+ elif [[ $program_name == @!screen || $program_name == @!tmux ]]; then
program_name="@:!${HOST//.*/}"
fi
fi
@@ -425,9 +442,9 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
window_reset=
}
- # Sets the window title. Works with screen, xterm and rxvt. (V) escapes
- # all non-printable characters. Thanks to Mikachu in #zsh on Freenode
- # (2010-08-07 17:09 CEST).
+ # Sets the window title. Works with screen, tmux (which uses screen as
+ # TERM), xterm and rxvt. (V) escapes all non-printable characters. Thanks
+ # to Mikachu in #zsh on Freenode (2010-08-07 17:09 CEST).
if [[ $TERM == screen* ]]; then
window_title() {
print -n "\ek${(V)1}\e\\"
@@ -442,8 +459,8 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
fi
# Add the preexec() and precmd() hooks.
- add-zsh-hook preexec window_preexec
- add-zsh-hook precmd window_precmd
+ preexec_functions+=(window_preexec)
+ precmd_functions+=(window_precmd)
else
# Fallback if another TERM is used, necessary to run screen (see below in
# "RUN COMMANDS").
@@ -483,10 +500,20 @@ setopt completeinword
zstyle ':completion:::::' completer \
_expand _complete _prefix _ignored _approximate
-# 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.
+# Match specification to be tried when completing items. Each group ('...') is
+# tried after another if no matches were found, once matches are found no
+# other groups are tried. Thanks to Mikachu in #zsh on Freenode (2012-08-28
+# 18:48 CEST) for explanations.
+#
+# When matching also include the uppercase variant of typed characters
+# ('m:{a-z}={A-Z}'); using '' before this group would try the unmodified match
+# first, but I prefer to get all matches immediately (e.g. if Makefile and
+# makefile exist in the current directory echo m matches both, with '' it
+# would only match makefile because it found one match). This allows typing in
+# lowercase most of the time and completion fixes the case, which is faster.
+#
+# 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
@@ -515,7 +542,7 @@ zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
# 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
+# Also display a message if _approximate found errors and no matches were
# found.
zstyle ':completion:*' format ' %B%d%b:'
zstyle ':completion:*:corrections' format ' %B%d%b (errors: %e)'
@@ -574,6 +601,12 @@ bindkey '^F' complete-files
# for a fix (-r) to handle whitespace/quotes
# correctly, both on the Zsh mailing list.
TRAPINT() {
+ # Don't store this line in history if histignorespace is enabled and the
+ # line starts with a space.
+ if [[ -o histignorespace && ${BUFFER[1]} = " " ]]; then
+ return $1
+ fi
+
# Store the current buffer in the history.
zle && print -s -r -- $BUFFER
@@ -589,15 +622,21 @@ fi
# Make sure aliases are expanded when using sudo.
alias sudo='sudo '
-# Global aliases for often used commands in the command line.
+# Global aliases for often used redirections.
alias -g E='2>&1'
-alias -g L='E | less'
-alias -g D='E | colordiff L'
+alias -g N='>/dev/null'
+alias -g EN='2>/dev/null'
+alias -g L='2>&1 | less'
+alias -g LS='2>&1 | less -S' # -S prevents wrapping of long lines
+alias -g D='2>&1 | colordiff | less'
+# Global aliases for often used commands in the command line.
+alias -g A='| awk'
alias -g G='| grep'
-alias -g S='| sort'
-alias -g U='| uniq'
alias -g H='| head'
+alias -g P='| perl'
+alias -g S='| sort'
alias -g T='| tail'
+alias -g U='| uniq'
# Make going up directories simple.
alias -g ...='../..'
@@ -613,33 +652,52 @@ 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).
-gitk() {
- command gitk \
- --max-count=200 \
- $(git rev-parse --symbolic-full-name --remotes --branches) \
- $@ &
+# much faster. Also put in the background and disown. Thanks to drizzd in #git
+# on Freenode (2010-04-03 17:55 CEST).
+(( $+commands[gitk] )) && gitk() {
+ 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) \
- $@
+(( $+commands[tig] )) && tig() {
+ command tig --max-count=200 --branches --remotes --tags "$@"
}
# Pipe output through less.
-tree() {
+(( $+commands[tree] )) && tree() {
command tree -C "$@" | less
}
-# Automatically disown.
-xpdf() {
- command xpdf "$@" &
- disown %command
+# Choose the "best" PDF viewer available: xpdf, then zathura (in the past
+# zathura was preferred, but recent versions are completely broken: still no
+# working search and no page-wise scrolling anymore). Also setup completion
+# for `pdf`.
+if (( $+commands[xpdf] )); then
+ pdf() {
+ command xpdf "$@" 2>/dev/null &
+ disown %command
+ }
+ compdef _xpdf pdf
+elif (( $+commands[zathura] )); then
+ pdf() {
+ command zathura "$@" 2>/dev/null &
+ disown %command
+ }
+ # No completion for zathura yet.
+ 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
}
@@ -656,26 +714,48 @@ fi
# LOAD ADDITIONAL CONFIGURATION FILES
+# Configuration option for rc.local to use GNU screen/tmux. By default GNU
+# screen is used. Possible values: screen, tmux.
+use_multiplexer=screen
+
source_config ~/.zsh/rc.local
# RUN COMMANDS
-# If not already in screen reattach to a running session or create a new one.
-# This also starts screen on a remote server when connecting through ssh.
-if [[ $TERM != dumb && $TERM != linux && -z $STY ]]; then
+# If not already in screen or tmux, reattach to a running session or create a
+# new one. This also starts screen/tmux on a remote server when connecting
+# through ssh.
+if [[ $TERM != dumb && $TERM != linux && -z $STY && -z $TMUX ]]; then
# Get running detached sessions.
- session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
+ if [[ $use_multiplexer = screen ]]; then
+ session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
+ elif [[ $use_multiplexer = tmux ]]; then
+ session=$(tmux list-sessions 2>/dev/null \
+ | sed '/(attached)$/ d; s/^\([0-9]\{1,\}\).*$/\1/; q')
+ fi
# As we exec later we have to set the title here.
- window_preexec "screen"
+ if [[ $use_multiplexer = screen ]]; then
+ window_preexec "screen"
+ elif [[ $use_multiplexer = tmux ]]; then
+ window_preexec "tmux"
+ fi
# Create a new session if none is running.
if [[ -z $session ]]; then
- exec screen
+ if [[ $use_multiplexer = screen ]]; then
+ exec screen
+ elif [[ $use_multiplexer = tmux ]]; then
+ exec tmux
+ fi
# Reattach to a running session.
else
- exec screen -r $session
+ if [[ $use_multiplexer = screen ]]; then
+ exec screen -r $session
+ elif [[ $use_multiplexer = tmux ]]; then
+ exec tmux attach-session -t $session
+ fi
fi
fi
@@ -687,7 +767,7 @@ fi
# cases it doesn't work, the E alias can be used as workaround.
#
# Moved in the "run commands" section to prevent one unnecessary zsh process
-# when starting screen (see above).
+# when starting screen/tmux (see above).
exec 2>>(while read -r -k -u 0 line; do
printf '\e[91m%s\e[0m' "$line";
print -n $'\0';
@@ -696,7 +776,7 @@ done &)
# Run reminder and redisplay it every four hours (if it's available).
PERIOD=14400
periodic() {
- which rem > /dev/null && [ -f ~/.reminders ] && rem -h
+ (( $+commands[rem] )) && [ -f ~/.reminders ] && rem -h
}