X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=18c66952e56b0599fc8a481b046bb775358e065b;hb=fd641de15b288191fca8ab4cfd17c85f03c24456;hp=a1acba570b2a2686aa85a9538af9d9600478e82c;hpb=b5a2aca208003314ecf366460546f5df2779d930;p=config%2Fdotfiles.git
diff --git a/zsh/rc b/zsh/rc
index a1acba5..18c6695 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -1,6 +1,6 @@
# Zsh configuration file.
-# Copyright (C) 2011-2012 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,12 +16,42 @@
# 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
+
+
+# HELPER FUNCTIONS
+
+# Return the name of the program which is called in the foreground with `fg`.
+# $1 is the name of the program (optional). If it's not 'fg' or 'fg *' it's
+# returned unchanged.
+zshrc_resolve_fg_to_resumed_job_name() {
+ # $REPLY is used by convention for scalars ($reply for arrays) to return
+ # values from functions. unset it here to prevent problems when REPLY is
+ # bound to an integer or similar. Thanks to Mikachu in #zsh on Freenode
+ # (2012-09-27 17:14 CEST) for this hint.
+ unset REPLY
+
+ # Replace fg with the resumed job name.
+ if [[ $1 == fg ]]; then
+ REPLY=${jobtexts[%+]}
+ elif [[ $1 == fg\ * ]]; then
+ REPLY=${jobtexts[${1#fg }]}
+ # Normal program, return as is.
+ else
+ REPLY=$1
+ fi
+}
+
# MISCELLANEOUS SETTINGS
-# Be paranoid, new files are readable/writable by me only.
-umask 077
+# Prevent warnings.
+typeset -g TMOUT
+# Load general shell setup commands. NOTE: Expand this when publishing the
+# config.
+source_config ~/.shell/rc
# Disable beeps.
setopt nobeep
@@ -41,9 +71,13 @@ setopt correct
# Enable zsh's extended glob abilities.
setopt extendedglob
-# Don't exit if is pressed.
+# Don't exit if is pressed. Prevents exiting the shell by accident (e.g.
+# pressing twice).
setopt ignoreeof
+# Also display PID when suspending a process.
+setopt longlistjobs
+
# KEY BINDINGS
@@ -52,8 +86,7 @@ setopt ignoreeof
# Use Vi(m) style key bindings.
bindkey -v
-# Use jj and jk to exit insert mode.
-bindkey 'jj' vi-cmd-mode
+# Use jk to exit insert mode (jj is too slow).
bindkey 'jk' vi-cmd-mode
# I don't need the arrow keys, I use ^N and ^P for this (see below).
@@ -67,7 +100,7 @@ bindkey -a -r '^[OA' '^[OB' '^[OC' '^[OD' '^[[A' '^[[B' '^[[C' '^[[D'
# 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.
+# of a Zsh Git checkout. Use it to get the newest completions if available.
if [[ -d ~/.zsh/functions/completion ]]; then
fpath=(~/.zsh/functions/completion/*/*(/) $fpath)
fi
@@ -82,13 +115,7 @@ 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() {
@@ -108,9 +135,6 @@ if [[ $ZSH_VERSION != (4.3.<5->|4.<4->*|<5->*) ]]; then
}
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
@@ -129,14 +153,15 @@ 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
# 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() {
+zle -N zshrc-vi-history-beginning-search-backward
+zshrc-vi-history-beginning-search-backward() {
local not_at_beginning_of_line
if [[ $CURSOR -ne 0 ]]; then
not_at_beginning_of_line=yes
@@ -151,12 +176,22 @@ my-vi-history-beginning-search-backward() {
zle vi-forward-char
fi
}
-bindkey '^P' my-vi-history-beginning-search-backward
+bindkey '^P' zshrc-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
+# Enable incremental search which is especially useful when the string is an
+# argument and not the command.
+bindkey '^R' history-incremental-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-search-backward
+ bindkey -M isearch '^N' history-incremental-search-forward
+fi
+
# Automatically push cd-ed directories on the directory stack.
setopt autopushd
# Don't push duplicates on the directory stack.
@@ -170,7 +205,7 @@ 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
@@ -186,7 +221,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
@@ -197,8 +232,8 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
# Load vcs_info to display information about version control repositories.
autoload -Uz vcs_info
- # Only look for git and mercurial repositories; the only I use.
- zstyle ':vcs_info:*' enable git hg
+ # Only look for certain VCS.
+ zstyle ':vcs_info:*' enable git
# 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 yes
@@ -207,19 +242,21 @@ 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)"
+ "(${green}%b%u%c${default}:${blue}%s${default}%m)" \
+ "${green}%u%c${default}"
zstyle ':vcs_info:*' actionformats \
- "($green%b%u%c$default/$red%a$default:$blue%s$default)"
+ "(${green}%b%u%c${default}/${red}%a${default}:${blue}%s${default}%m)" \
+ "${green}%u%c${default}"
else
# In older versions %u and %c are not defined yet and are not
# correctly expanded.
zstyle ':vcs_info:*' formats \
- "($green%b$default:$blue%s$default)"
+ "(${green}%b${default}:${blue}%s${default})"
zstyle ':vcs_info:*' actionformats \
- "($green%b$default/$red%a$default:$blue%s$default)"
+ "(${green}%b${default}/${red}%a${default}:${blue}%s${default})"
fi
# Set style for formats/actionformats when unstaged (%u) and staged (%c)
# changes are detected in the repository; check-for-changes must be set to
@@ -231,7 +268,7 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
# 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
+ zshrc_force_run_vcs_info=1
# Cache system inspired by Bart Trojanowski
# (http://jukie.net/~bart/blog/pimping-out-zsh-prompt).
@@ -239,12 +276,12 @@ 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.
- if [[ -n $FORCE_RUN_VCS_INFO ]]; then
- FORCE_RUN_VCS_INFO=
+ if [[ -n $zshrc_force_run_vcs_info ]]; then
+ zshrc_force_run_vcs_info=
return
fi
@@ -252,7 +289,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
;;
@@ -262,18 +299,85 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
esac
}
+ # Display number of WIP stashes (this excludes manually named commits
+ # which might be used for something else), thanks to
+ # http://eseth.org/2010/git-in-zsh.html (viewed on 2013-04-27) for the
+ # idea to display the stash count.
+ function +vi-git-stashes() {
+ if [[ -s ${hook_com[base]/.git/refs/stash} ]]; then
+ local -a stashes
+ # Thanks to Valodim in #zsh on Freenode (2013-07-01 14:14 CEST)
+ # for the solution to "grep" the output with (M) and :#(...).
+ stashes=( ${(M)${(f)"$(git stash list 2>/dev/null)"}:#(*WIP*)} )
+
+ if [[ ${#stashes} -gt 0 ]]; then
+ hook_com[misc]+=" ${yellow}${#stashes}s${default}"
+ fi
+ fi
+ }
+
+ # Apply hooks to Git.
+ zstyle ':vcs_info:git*+set-message:*' hooks git-stashes
+
# Must run vcs_info when changing directories.
prompt_chpwd() {
- FORCE_RUN_VCS_INFO=1
+ zshrc_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
+ zshrc_use_vcs_info=1
else
- RUN_VCS_INFO=
+ zshrc_use_vcs_info=
fi
+typeset -a zshrc_longrun_data
+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
+
+ # Handle fg.
+ local REPLY
+ zshrc_resolve_fg_to_resumed_job_name $program
+ program=$REPLY
+
+ # Don't track the time for certain (possible) long running processes which
+ # need no automatic notification.
+ for ignore in elinks man mutt vim; do
+ case $program in
+ $ignore | $ignore\ *)
+ zshrc_longrun_data=()
+ return
+ ;;
+ esac
+ done
+
+ zshrc_longrun_data=($program $EPOCHSECONDS)
+}
+zshrc_longrun_precmd() {
+ # No previous timestamp available or disabled for this command, ignore.
+ if [[ -z $zshrc_longrun_data ]]; then
+ return
+ fi
+
+ local difference=$(( EPOCHSECONDS - zshrc_longrun_data[2] ))
+ if [[ $difference -gt 60 ]]; then
+ echo
+ echo -n "${fg[yellow]}"
+ echo -n "~> ${(V)zshrc_longrun_data[1]} took $difference seconds."
+ echo -n "${fg[default]}"
+ echo "\a" # send bell
+ fi
+
+ # Clear status. Prevents displaying old status information when pressing
+ # enter with an empty command line.
+ zshrc_longrun_data=()
+}
+preexec_functions+=(zshrc_longrun_preexec)
+precmd_functions+=(zshrc_longrun_precmd)
+
# 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) and the
# current time in hex. On the bottom left current user name and host is shown,
@@ -281,61 +385,100 @@ fi
# 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.
+# code in red and bold and the job count in yellow. Designed for dark
+# terminals.
#
# Thanks to Adam's prompt for the basic idea of this prompt.
-prompt_precmd() {
+zshrc_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
# Functions/Prompts/prompt_*_setup.
local zero='%([BSUbfksu]|([FB]|){*})'
# Call vcs_info before every prompt.
- if [[ -n $RUN_VCS_INFO ]]; then
+ if [[ -n $zshrc_use_vcs_info ]]; then
vcs_info
else
vcs_info_msg_0_=
+ vcs_info_msg_1_=
fi
- local width width_left width_right
- local top_left top_right
-
- # Display the current time in HEX in bright blue and vcs_info (if used) on
- # the right in the top prompt.
- top_right="$vcs_info_msg_0_($blue%B0x$(([##16] EPOCHSECONDS))%b$default)"
- width_right=${#${(S%%)top_right//$~zero/}}
- # Remove it if it would get too long.
- if [[ $(( COLUMNS - 4 - 1 - width_right )) -lt 0 ]]; then
- top_right=
- width_right=0
+ # Setup. Create variables holding the formatted content.
+
+ # Current directory in yellow, truncated if necessary (WIDTH is replaced
+ # below).
+ 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_}
+
+ # Information about the VCS in this directory.
+ local vcs=${vcs_info_msg_0_}
+ # Current time (seconds since epoch) in Hex in bright blue.
+ local seconds="${blue}%B0x$(([##16] EPOCHSECONDS))%b${default}"
+
+ # User name (%n) in bright green.
+ local user="${green}%B%n%b${default}"
+ # Host name (%m) in bright green; underlined if running on a remote system
+ # through SSH.
+ local host="${green}%B%m%b${default}"
+ if [[ -n $SSH_CONNECTION ]]; then
+ host="%U${host}%u"
fi
- # Display current directory on the left in the top prompt. Truncate the
- # directory if necessary.
- width=$(( COLUMNS - 4 - 1 - width_right ))
- top_left=".-$default%b($yellow%$width<..<%~%<<$default)%B$blue"
+ # Number of background processes in yellow if not zero.
+ local background="%(1j.${yellow}%j${default}.)"
+ # Exit code in bright red in parentheses if not zero.
+ local exitcode="%(?..(${red}%B%?%b${default}%) )"
+ # Prompt symbol, % for normal users, # in red for root.
+ local symbol="%(!.${red}#${default}.%%)"
+
+ # Prefix characters in first and second line.
+ local top_prefix="${blue}%B.-%b${default}"
+ local bottom_prefix="${blue}%B'%b${default}"
+
+ # Combine them to create the prompt.
+
+ local top_left=${vcs_staged}
+ local top_right="${vcs}(${seconds})"
+
+ local width_top_prefix=${#${(S%%)top_prefix//$~zero/}}
+ local width_top_left=${#${(S%%)top_left//$~zero/}}
+ local width_top_right=${#${(S%%)top_right//$~zero/}}
+
+ # Calculate the maximum width of ${top_left}. -2 are the braces of
+ # ${top_left}, -1 is one separator from ${top_separator} (we want at least
+ # one between left and right parts).
+ local top_left_width_max=$((
+ COLUMNS - $width_top_prefix
+ - $width_top_left - 2
+ - 1
+ - $width_top_right
+ ))
+ # Truncate directory if necessary.
+ top_left="(${directory/WIDTH/${top_left_width_max}})${top_left}"
+ width_top_left=${#${(S%%)top_left//$~zero/}}
# Calculate the width of the top prompt to fill the middle with "-".
- width_left=${#${(S%%)top_left//$~zero/}}
- width_right=${#${(S%%)top_right//$~zero/}}
- width=$(( COLUMNS - width_left - width_right ))
-
- PROMPT="$blue%B$top_left${(l:$width::-:)}%b$default$top_right
-$blue%B'%b$default\
-$green%B%n%b$default@$green%B%m%b$default %(1j.$yellow%j$default.)%# \
-%(?..($red%B%?%b$default%) )"
+ local width=$((
+ COLUMNS - width_top_prefix - width_top_left - width_top_right
+ ))
+ local top_separator="%B${blue}${(l:${width}::-:)}%b${default}"
+
+ PROMPT="${top_prefix}${top_left}${top_separator}${top_right}
+${bottom_prefix}${user}@${host} ${background}${symbol} ${exitcode}"
}
-add-zsh-hook precmd prompt_precmd
+precmd_functions+=(zshrc_prompt_precmd)
-# When screen, tmux, xterm or rxvt is used set the name of the window to the
-# currently running program.
+# When GNU 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'. 'fg' is supported and sets
# the window's name to the resumed job.
#
-# It works with screen, tmux, xterm and rxvt.
+# It works with GNU 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
@@ -349,17 +492,13 @@ add-zsh-hook precmd prompt_precmd
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 [[ $UID -eq 0 ]]; then
- window_root=yes
- fi
+ zshrc_window_reset=yes
- window_preexec() {
+ zshrc_window_preexec() {
# Get the program name with its arguments.
local program_name=$1
- # When sudo is used use real program name instead, but with an
+ # 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
@@ -367,12 +506,10 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
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
+ # Handle fg.
+ local REPLY
+ zshrc_resolve_fg_to_resumed_job_name $program_name
+ program_name=$REPLY
# Remove all arguments from the program name.
program_name=${program_name%% *}
@@ -391,16 +528,22 @@ 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
# running zsh as root.
- if [[ -n $program_sudo || -n $window_root ]]; then
+ if [[ -n $program_sudo || $UID -eq 0 ]]; then
program_name=!$program_name
fi
@@ -420,15 +563,15 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
fi
# Set the window name to the currently running program.
- window_title "$program_name"
+ zshrc_window_title $program_name
# Tell precmd() to reset the window name when the program stops.
- window_reset=yes
+ zshrc_window_reset=yes
}
- window_precmd() {
+ zshrc_window_precmd() {
# Abort if no window name reset is necessary.
- [[ -z $window_reset ]] && return
+ [[ -z $zshrc_window_reset ]] && return
# Reset the window name to 'zsh'.
local name=zsh
@@ -438,42 +581,42 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
name=.zsh
fi
- # Prepend prefixes like in window_preexec().
- if [[ -n $window_root ]]; then
+ # Prepend prefixes like in zshrc_window_preexec().
+ if [[ $UID -eq 0 ]]; then
name="!$name"
fi
if [[ -n $SSH_CONNECTION ]]; then
name="@$name"
fi
- window_title $name
+ zshrc_window_title $name
# Just reset the name, so no screen reset necessary for the moment.
- window_reset=
+ zshrc_window_reset=
}
- # Sets the window title. Works with screen, tmux (which uses screen as
- # TERM), xterm and rxvt. (V) escapes all non-printable characters. Thanks
+ # Sets the window title. Works with GNU 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() {
+ zshrc_window_title() {
print -n "\ek${(V)1}\e\\"
}
elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then
- window_title() {
+ zshrc_window_title() {
print -n "\e]2;${(V)1}\e\\"
}
else
# Fallback if another TERM is used.
- window_title() { }
+ zshrc_window_title() { }
fi
# Add the preexec() and precmd() hooks.
- add-zsh-hook preexec window_preexec
- add-zsh-hook precmd window_precmd
+ preexec_functions+=(zshrc_window_preexec)
+ precmd_functions+=(zshrc_window_precmd)
else
# Fallback if another TERM is used, necessary to run screen (see below in
# "RUN COMMANDS").
- window_preexec() { }
+ zshrc_window_preexec() { }
fi
@@ -486,16 +629,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,
@@ -506,13 +665,36 @@ 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
-# 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
@@ -558,6 +740,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
@@ -587,6 +777,12 @@ 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
+
# CUSTOM ALIASES AND FUNCTIONS
@@ -600,6 +796,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
@@ -615,15 +817,24 @@ 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.
+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 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 ...='../..'
@@ -635,8 +846,8 @@ alias -g .....='../../../..'
# 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'
+if [[ -n $zshrc_window_reset ]]; then
+ alias clear='clear; zshrc_window_reset=yes; zshrc_window_precmd reset'
fi
@@ -645,125 +856,206 @@ fi
# 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 drizzd in #git
# on Freenode (2010-04-03 17:55 CEST).
-gitk() {
+(( $+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() {
+(( $+commands[tig] )) && tig() {
command tig --max-count=200 --branches --remotes --tags "$@"
}
-# Pipe output through less.
-tree() {
- command tree -C "$@" | less
-}
-
-# Choose the "best" PDF viewer available: zathura, then xpdf. Also setup
-# completion for `pdf`.
-if (( $+commands[zathura] )); then
+# 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 zathura "$@" 2>/dev/null &
+ command xpdf "$@" 2>/dev/null &
disown %command
}
- # No completion for zathura yet.
- compdef _xpdf pdf
-elif (( $+commands[xpdf] )); then
+ compdef pdf=xpdf
+elif (( $+commands[zathura] )); then
pdf() {
- command xpdf "$@" 2>/dev/null &
+ command zathura "$@" 2>/dev/null &
disown %command
}
- compdef _xpdf pdf
+ # No completion for zathura yet.
+ 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
if [[ $OSTYPE == linux* ]]; then
# Settings when creating Debian packages.
- DEBEMAIL=simon@ruderich.org
- export DEBEMAIL
- DEBFULLNAME='Simon Ruderich'
- export DEBFULLNAME
+ export DEBEMAIL=simon@ruderich.org
+ export DEBFULLNAME='Simon Ruderich'
fi
# LOAD ADDITIONAL CONFIGURATION FILES
-# Configuration option for rc.local to use tmux. By default screen is used.
-use_tmux=
+# Configuration options for rc.local.
+
+# Multiplexer to use. By default GNU screen is used. Possible values: screen,
+# tmux and empty (no multiplexer).
+zshrc_use_multiplexer=screen
+# Additional arguments for fortune.
+zshrc_fortune_arguments=()
source_config ~/.zsh/rc.local
# RUN COMMANDS
+# Make sure the multiplexer is available. Otherwise the exec terminates our
+# session.
+if [[ -n $zshrc_use_multiplexer ]]; then
+ if ! (( $+commands[$zshrc_use_multiplexer] )); then
+ echo "Multiplexer '$zshrc_use_multiplexer' not found." >&2
+ zshrc_use_multiplexer=
+ fi
+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
# Get running detached sessions.
- if [[ -z $use_tmux ]]; then
- session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
- else
+ if [[ $zshrc_use_multiplexer = screen ]]; then
+ session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
+ elif [[ $zshrc_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.
- if [[ -z $use_tmux ]]; then
- window_preexec "screen"
- else
- window_preexec "tmux"
+ if [[ $zshrc_use_multiplexer = screen ]]; then
+ zshrc_window_preexec screen
+ elif [[ $zshrc_use_multiplexer = tmux ]]; then
+ zshrc_window_preexec tmux
fi
# Create a new session if none is running.
if [[ -z $session ]]; then
- if [[ -z $use_tmux ]]; then
- exec screen
- else
+ if [[ $zshrc_use_multiplexer = screen ]]; then
+ exec screen
+ elif [[ $zshrc_use_multiplexer = tmux ]]; then
exec tmux
fi
# Reattach to a running session.
else
- if [[ -z $use_tmux ]]; then
- exec screen -r $session
- else
+ if [[ $zshrc_use_multiplexer = screen ]]; then
+ exec screen -r $session
+ elif [[ $zshrc_use_multiplexer = tmux ]]; then
exec tmux attach-session -t $session
fi
fi
fi
-# Colorize stderr in 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 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 &)
-
-# Run reminder and redisplay it every four hours (if it's available).
+# 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
+# executed and only one shell is started on login.
+if [[ -f ~/.xinitrc.errors ]]; then
+ echo "${fg_bold[red]}xinitrc failed!${fg_bold[default]}"
+ echo
+ cat ~/.xinitrc.errors
+ rm ~/.xinitrc.errors
+ echo
+fi
+
+# Run the following programs every 4 hours (and when zsh starts).
PERIOD=14400
periodic() {
- (( $+commands[rem] )) && [ -f ~/.reminders ] && rem -h
+ # Display fortunes.
+ (( $+commands[fortune] )) && fortune -ac "${zshrc_fortune_arguments[@]}"
+ # Display reminders.
+ (( $+commands[rem] )) && [[ -f ~/.reminders ]] && rem -h
}
-source_debug ". ~/.zsh/rc (done)"
+# RESTART SETTINGS
+
+zmodload -F zsh/stat b:zstat
+
+# Remember startup time. Used to perform automatic restarts when ~/.zshrc is
+# modified.
+zshrc_startup_time=$EPOCHSECONDS
+
+# Automatically restart Zsh if ~/.zshrc was modified.
+zshrc_restart_precmd() {
+ local stat
+ if ! zstat -A stat +mtime ~/.zshrc; then
+ return
+ fi
+
+ # ~/.zshrc wasn't modified, nothing to do.
+ if [[ $stat -le $zshrc_startup_time ]]; then
+ return
+ fi
+
+ local startup
+ strftime -s startup '%Y-%m-%d %H:%M:%S' "$zshrc_startup_time"
+
+ echo -n "${fg[magenta]}"
+ echo -n "~/.zshrc modified since startup ($startup) ... "
+ echo -n "${fg[default]}"
+
+ if [[ -n $zshrc_disable_restart ]]; then
+ echo 'automatic restart disabled.'
+ return
+ fi
+
+ # Don't exec if we have background processes because execing will let us
+ # lose control over them.
+ if [[ ${#${(k)jobstates}} -ne 0 ]]; then
+ echo 'active background jobs!'
+ return
+ fi
+
+ # Try to start a new interactive shell. If it fails, something is wrong.
+ # Don't kill our current session by execing it.
+ zsh -i -c 'exit 42'
+ if [[ $? -ne 42 ]]; then
+ echo -n "${fg_bold[red]}"
+ echo 'failed to start new zsh!'
+ echo -n "${fg_bold[default]}"
+ return
+ fi
+
+ echo 'restarting zsh.'
+ echo
+
+ exec zsh
+}
+precmd_functions+=(zshrc_restart_precmd)
# vim: ft=zsh