X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=dde2ebbc9effbc43abed62ff60f266f4df30bf15;hb=8e71f6b905ec7ef2105d59a949d784a64ce9a574;hp=2d7331ceaf89c95fcd311f327029f229fc632255;hpb=236d8125f35d68d4277d4e40d71fbb384750ed94;p=config%2Fdotfiles.git
diff --git a/zsh/rc b/zsh/rc
index 2d7331c..dde2ebb 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -1,6 +1,6 @@
# Zsh configuration file.
-# Copyright (C) 2011-2013 Simon Ruderich
+# Copyright (C) 2011-2014 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
@@ -16,9 +16,6 @@
# along with this file. If not, see .
-source_debug '. ~/.zsh/rc'
-
-
# Warn when creating global variables from inside a function. Needs to be set
# before declaring a function.
setopt warn_create_global
@@ -38,18 +35,20 @@ zshrc_resolve_fg_to_resumed_job_name() {
# Replace fg with the resumed job name.
if [[ $1 == fg ]]; then
- REPLY="${jobtexts[%+]}"
+ REPLY=${jobtexts[%+]}
elif [[ $1 == fg\ * ]]; then
- REPLY="${jobtexts[${1#fg }]}"
+ REPLY=${jobtexts[${1#fg }]}
# Normal program, return as is.
else
- REPLY="$1"
+ REPLY=$1
fi
}
# MISCELLANEOUS SETTINGS
+# Prevent warnings.
+typeset -g TMOUT
# Load general shell setup commands. NOTE: Expand this when publishing the
# config.
source_config ~/.shell/rc
@@ -76,6 +75,9 @@ setopt extendedglob
# pressing twice).
setopt ignoreeof
+# Also display PID when suspending a process.
+setopt longlistjobs
+
# KEY BINDINGS
@@ -84,7 +86,7 @@ setopt ignoreeof
# Use Vi(m) style key bindings.
bindkey -v
-# Use jk to exit insert mode (jj is too slow).
+# Use jk to exit insert mode (jj is too slow to type).
bindkey 'jk' vi-cmd-mode
# I don't need the arrow keys, I use ^N and ^P for this (see below).
@@ -140,8 +142,8 @@ autoload -Uz zmv
# HISTORY SETTINGS
# Use history and store it in ~/.zsh/history.
-HISTSIZE=50000
-SAVEHIST=50000
+HISTSIZE=1000000
+SAVEHIST=1000000
HISTFILE=~/.zsh/history
# Append to the history file instead of overwriting it and do it immediately
# when a command is executed.
@@ -151,6 +153,7 @@ setopt incappendhistory
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
@@ -179,6 +182,16 @@ bindkey -a '^P' history-beginning-search-backward # binding for Vi-mode
# after calling ^P.
bindkey -a '^N' history-beginning-search-forward
+# Enable incremental search which is especially useful when the string is an
+# argument and not the command.
+bindkey '^R' history-incremental-pattern-search-backward
+# Also enable my usual use of Ctrl-P/Ctrl-N to get the previous/next matching
+# history entry.
+if [[ $ZSH_VERSION == (4.<4->*|<5->*) ]]; then
+ bindkey -M isearch '^P' history-incremental-pattern-search-backward
+ bindkey -M isearch '^N' history-incremental-pattern-search-forward
+fi
+
# Automatically push cd-ed directories on the directory stack.
setopt autopushd
# Don't push duplicates on the directory stack.
@@ -192,13 +205,14 @@ setopt pushdminus
# PROMPT SETTINGS
# Use colorized output, necessary for prompts and completions.
-autoload -Uz colors && colors
+autoload -Uz colors; colors
# Necessary for $EPOCHSECONDS, the UNIX time.
zmodload zsh/datetime
# Some shortcuts for colors. The %{...%} tells zsh that the data in between
-# doesn't need any space, necessary for correct prompt drawing.
+# doesn't need any space, necessary for correct prompt drawing. Use %F{color}
+# in more recent zsh versions (here compatibility is important).
local red="%{${fg[red]}%}"
local blue="%{${fg[blue]}%}"
local green="%{${fg[green]}%}"
@@ -263,7 +277,7 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) ||
+vi-pre-get-data() {
# Only Git and Mercurial support and need caching. Abort if any other
# VCS is used.
- [[ "$vcs" != git && "$vcs" != hg ]] && return
+ [[ $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.
@@ -276,7 +290,7 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) ||
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
+ case $(fc -ln $(($HISTCMD-1))) in
git* | g\ *)
ret=0
;;
@@ -323,15 +337,21 @@ zshrc_longrun_data=()
# Display runtime in seconds for long running programs (> 60 seconds) and send
# a bell to notify me.
zshrc_longrun_preexec() {
- local program="$3"
+ local program=$3
# Handle fg.
local REPLY
- zshrc_resolve_fg_to_resumed_job_name "$program"
- program="$REPLY"
+ zshrc_resolve_fg_to_resumed_job_name $program
+ program=$REPLY
+
+ # No background process found.
+ if [[ -z $program ]]; then
+ return
+ fi
# Don't track the time for certain (possible) long running processes which
# need no automatic notification.
+ local ignore
for ignore in elinks man mutt vim; do
case $program in
$ignore | $ignore\ *)
@@ -341,7 +361,7 @@ zshrc_longrun_preexec() {
esac
done
- zshrc_longrun_data=("$program" $EPOCHSECONDS)
+ zshrc_longrun_data=($program $EPOCHSECONDS)
}
zshrc_longrun_precmd() {
# No previous timestamp available or disabled for this command, ignore.
@@ -397,10 +417,10 @@ zshrc_prompt_precmd() {
local directory="${yellow}%WIDTH<..<%~%<<${default}"
# Minimal information about the VCS, only displayed if there are
# unstaged/staged changes.
- local vcs_staged="${vcs_info_msg_1_}"
+ local vcs_staged=${vcs_info_msg_1_}
# Information about the VCS in this directory.
- local vcs="${vcs_info_msg_0_}"
+ local vcs=${vcs_info_msg_0_}
# Current time (seconds since epoch) in Hex in bright blue.
local seconds="${blue}%B0x$(([##16] EPOCHSECONDS))%b${default}"
@@ -426,7 +446,7 @@ zshrc_prompt_precmd() {
# Combine them to create the prompt.
- local top_left="${vcs_staged}"
+ local top_left=${vcs_staged}
local top_right="${vcs}(${seconds})"
local width_top_prefix=${#${(S%%)top_prefix//$~zero/}}
@@ -495,8 +515,8 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
# Handle fg.
local REPLY
- zshrc_resolve_fg_to_resumed_job_name "$program_name"
- program_name="$REPLY"
+ zshrc_resolve_fg_to_resumed_job_name $program_name
+ program_name=$REPLY
# Remove all arguments from the program name.
program_name=${program_name%% *}
@@ -515,11 +535,17 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
program_name=git
;;
m)
- program_name=mutt
+ program_name=make
+ ;;
+ p)
+ program_name=less
;;
v)
program_name=vim
;;
+ mu)
+ program_name=mutt
+ ;;
esac
# Add an exclamation mark at the beginning if running with sudo or if
@@ -544,7 +570,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
fi
# Set the window name to the currently running program.
- zshrc_window_title "$program_name"
+ zshrc_window_title $program_name
# Tell precmd() to reset the window name when the program stops.
zshrc_window_reset=yes
@@ -610,16 +636,32 @@ zmodload zsh/complist
# cluttering of ~/. $fpath must be set before calling this. Thanks to Adlai in
# #zsh on Freenode (2009-08-07 21:05 CEST) for reminding me of the $fpath
# problem.
-autoload -Uz compinit && compinit -d ~/.zsh/cache/zcompdump
+autoload -Uz compinit; compinit -d ~/.zsh/cache/zcompdump
# Use cache to speed up some slow completions (dpkg, perl modules, etc.).
zstyle ':completion:*' use-cache yes
zstyle ':completion:*' cache-path ~/.zsh/cache
+# List all files in the current directory when pressing tab on an empty input,
+# behave like complete-word otherwise. Thanks to John Eikenberry [1] for the
+# code, read on 2014-03-15.
+#
+# [1]: http://unix.stackexchange.com/a/32426
+complete-word-or-complete-list-of-files() {
+ if [[ $#BUFFER == 0 ]]; then
+ BUFFER='ls '
+ CURSOR=3
+ zle list-choices
+ zle backward-kill-word
+ else
+ zle complete-word
+ fi
+}
+zle -N complete-word-or-complete-list-of-files
# 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
+bindkey '^I' complete-word-or-complete-list-of-files
# 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,
@@ -630,8 +672,21 @@ setopt nolistambiguous
# the _prefix completer.
setopt completeinword
+# Force a reload of the completion system if nothing matched; this fixes
+# installing a program and then trying to tab-complete its name. Thanks to
+# Alex Munroe [1] for the code, read on 2014-03-03.
+#
+# [1]: https://github.com/eevee/rc/blob/master/.zshrc
+_force_rehash() {
+ if (( CURRENT == 1 )); then
+ rehash
+ fi
+ # We didn't really complete anything.
+ return 1
+}
+
zstyle ':completion:::::' completer \
- _expand _complete _prefix _ignored _approximate
+ _force_rehash _expand _complete _prefix _ignored _approximate
# Match specification to be tried when completing items. Each group ('...') is
# tried after another if no matches were found, once matches are found no
@@ -692,6 +747,14 @@ zle_highlight=(suffix:none)
# Ignore completion functions.
zstyle ':completion:*:functions' ignored-patterns '_*'
+
+# When offering typo corrections, do not propose anything which starts with an
+# underscore (such as many of Zsh's shell functions). Thanks to paradigm [1]
+# for the idea (read on 2013-04-07).
+#
+# [1]: https://github.com/paradigm/dotfiles/blob/master/.zshrc
+CORRECT_IGNORE='_*'
+
# Ignore parent directory.
zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
# Always complete file names only once in the current line. This makes it easy
@@ -711,7 +774,9 @@ 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 for a way to complete them.
zstyle ':completion:*:*:vim:*:all-files' ignored-patterns \
- '*.aux' '*.log' '*.pdf' \
+ '*.aux' '*.log' '*.pdf' '*.bbl' '*.blg' '*.out' '*-blx.bib' '*.run.xml' \
+ '*.o' \
+ '*.pyc' \
'*.class'
# Provide a fallback completer which always completes files. Useful when Zsh's
@@ -721,6 +786,13 @@ zle -C complete-files complete-word _generic
zstyle ':completion:complete-files:*' completer _files
bindkey '^F' complete-files
+# Completion for my wrapper scripts.
+compdef slocate=locate
+compdef srsync=rsync
+compdef srsync-incremental=rsync
+compdef svalgrind=valgrind
+compdef sc=systemctl
+
# CUSTOM ALIASES AND FUNCTIONS
@@ -736,7 +808,7 @@ bindkey '^F' complete-files
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
+ if [[ -o histignorespace && ${BUFFER[1]} = ' ' ]]; then
return $1
fi
@@ -764,12 +836,18 @@ 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.
alias -g A='| awk'
+alias -g A1="| awk '{ print \$1 }'"
+alias -g A2="| awk '{ print \$2 }'"
+alias -g A3="| awk '{ print \$3 }'"
alias -g G='| grep'
+alias -g GB='| grep -vE "^Binary file .+ matches\$"'
alias -g H='| head'
alias -g P='| perl'
alias -g S='| sort'
+alias -g SL='| sort | less'
alias -g T='| tail'
alias -g U='| uniq'
+alias -g X='`xsel -p || xclip -o`' # X selection
# Make going up directories simple.
alias -g ...='../..'
@@ -800,39 +878,29 @@ fi
command tig --max-count=200 --branches --remotes --tags "$@"
}
-# Pipe output through less.
-(( $+commands[tree] )) && tree() {
- command tree -C "$@" | less
-}
-
-# 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
+# Choose the "best" PDF viewer available. Also setup completion for `pdf`.
+if (( $+commands[katarakt] )); then
+ pdf() {
+ command katarakt "$@" 2>/dev/null &
+ disown %command
+ }
+ # No completion for katarakt yet.
+ compdef pdf=xpdf
+elif (( $+commands[xpdf] )); then
pdf() {
command xpdf "$@" 2>/dev/null &
disown %command
}
- compdef _xpdf pdf
+ compdef pdf=xpdf
elif (( $+commands[zathura] )); then
pdf() {
command zathura "$@" 2>/dev/null &
disown %command
}
# No completion for zathura yet.
- compdef _xpdf pdf
+ compdef pdf=xpdf
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
-}
-
# OS SPECIFIC SETTINGS
@@ -870,7 +938,8 @@ fi
# 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
+if [[ $TERM != dumb && $TERM != dialup && $TERM != linux
+ && -z $STY && -z $TMUX ]]; then
# Get running detached sessions.
if [[ $zshrc_use_multiplexer = screen ]]; then
session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
@@ -903,19 +972,32 @@ if [[ $TERM != dumb && $TERM != linux && -z $STY && -z $TMUX ]]; then
fi
fi
-# Colorize stderr in bold 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 CET) 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
-# 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 GNU screen/tmux (see above).
-exec 2>>(while read -r -k -u 0 line; do
- printf '\e[91m%s\e[0m' "$line"
- print -n $'\0'
-done &)
+# Colorize stderr in bold red. Very useful when looking for errors.
+if [[ $LD_PRELOAD != *libcoloredstderr.so* ]]; then
+ # coloredstderr found, use it.
+ if [[ -f ~/.zsh/libcoloredstderr.so ]]; then
+ export LD_PRELOAD="$HOME/.zsh/libcoloredstderr.so:$LD_PRELOAD"
+ export COLORED_STDERR_FDS=2,
+ export COLORED_STDERR_PRE=$'\033[91m' # bright red
+ export COLORED_STDERR_IGNORED_BINARIES=/usr/bin/tset
+ # Use the fallback solution.
+ #
+ # Thanks to http://gentoo-wiki.com/wiki/Zsh for the basic script and
+ # Mikachu in #zsh on Freenode (2010-03-07 04:03 CET) 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 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 GNU screen/tmux (see above).
+ else
+ exec 2>>(while read -r -k -u 0 line; do
+ printf '\e[91m%s\e[0m' $line
+ print -n $'\0'
+ done &)
+ fi
+fi
# Display possible log messages from ~/.xinitrc (if `xmessage` wasn't
# installed). No race condition as xinitrc has finished before a shell is
@@ -959,7 +1041,7 @@ zshrc_restart_precmd() {
fi
local startup
- strftime -s startup '%Y-%m-%d %H:%M:%S' "$zshrc_startup_time"
+ strftime -s startup '%Y-%m-%d %H:%M:%S' $zshrc_startup_time
echo -n "${fg[magenta]}"
echo -n "~/.zshrc modified since startup ($startup) ... "
@@ -978,12 +1060,12 @@ zshrc_restart_precmd() {
fi
# Try to start a new interactive shell. If it fails, something is wrong.
- # Don't kill our current session by execing it.
+ # Don't kill our current session by execing it, abort instead.
zsh -i -c 'exit 42'
if [[ $? -ne 42 ]]; then
- echo -n "${fg_bold[red]}"
+ echo -n ${fg_bold[red]}
echo 'failed to start new zsh!'
- echo -n "${fg_bold[default]}"
+ echo -n ${fg_bold[default]}
return
fi
@@ -995,6 +1077,38 @@ zshrc_restart_precmd() {
precmd_functions+=(zshrc_restart_precmd)
-source_debug '. ~/.zsh/rc (done)'
+# RELOAD SETTINGS
+
+zshenv_reload_time=0 # load before first command
+zshenv_boot_time=$(date -d "$(uptime -s)" '+%s') # uptime in epoch seconds
+
+# Automatically source ~/.zsh/env.update when the file changes (and exists).
+# Can be used e.g. to update SSH_AGENT_PID and GPG_AGENT_INFO variables in
+# running zsh processes. Sourced immediately before executing shell commands
+# (preexec) to ensure the environment is always up to date.
+zshenv_reload_preexec() {
+ local file
+ file=~/.zsh/env.update
+
+ local stat
+ if ! zstat -A stat +mtime $file 2>/dev/null; then
+ return
+ fi
+ # File was modified before reboot. Skip it to prevent loading of old
+ # values.
+ if [[ $stat -lt $zshenv_boot_time ]]; then
+ return
+ fi
+ # File wasn't modified, nothing to do.
+ if [[ $stat -le $zshenv_reload_time ]]; then
+ return
+ fi
+ zshenv_reload_time=$EPOCHSECONDS
+
+ unsetopt warn_create_global
+ . $file
+ setopt warn_create_global
+}
+preexec_functions+=(zshenv_reload_preexec)
# vim: ft=zsh