X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=96b45e4e6b43b0500a4624916a774452a4a852b9;hb=8f24a1138ad378038239e8d0cb9619864f7ca026;hp=c6691783224feb182fc95edfc7f521d98fbad12b;hpb=059958b05df78c658fb4fd6b350cfaeb1756b799;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index c669178..96b45e4 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -1,6 +1,6 @@
 # Zsh configuration file.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2013  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 <http://www.gnu.org/licenses/>.
 
 
-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
@@ -50,10 +47,11 @@ zshrc_resolve_fg_to_resumed_job_name() {
 
 # MISCELLANEOUS SETTINGS
 
-# Be paranoid, new files are readable/writable by me only, but not as root.
-if [[ $UID -ne 0 ]]; then
-    umask 077
-fi
+# 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
@@ -77,6 +75,9 @@ setopt extendedglob
 # pressing <C-D> twice).
 setopt ignoreeof
 
+# Also display PID when suspending a process.
+setopt longlistjobs
+
 
 # KEY BINDINGS
 
@@ -85,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).
@@ -153,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
@@ -181,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-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.
@@ -194,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
@@ -221,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
@@ -234,10 +245,10 @@ if [[ $ZSH_VERSION == (4.3.<9->*|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
@@ -288,6 +299,26 @@ 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() {
         zshrc_force_run_vcs_info=1
@@ -399,6 +430,8 @@ zshrc_prompt_precmd() {
     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}"
@@ -433,7 +466,7 @@ zshrc_prompt_precmd() {
     local top_separator="%B${blue}${(l:${width}::-:)}%b${default}"
 
     PROMPT="${top_prefix}${top_left}${top_separator}${top_right}
-${bottom_prefix}${user}@${host} ${background}%# ${exitcode}"
+${bottom_prefix}${user}@${host} ${background}${symbol} ${exitcode}"
 }
 precmd_functions+=(zshrc_prompt_precmd)
 
@@ -495,11 +528,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
@@ -542,7 +581,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
             name=.zsh
         fi
 
-        # Prepend prefixes like in window_preexec().
+        # Prepend prefixes like in zshrc_window_preexec().
         if [[ $UID -eq 0 ]]; then
             name="!$name"
         fi
@@ -590,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 <Tab> always display them
 # immediately without requiring another <Tab>. a<Tab> completes to aa and
 # lists aaa, aab, aac as possible completions if the directory contains aaa,
@@ -610,8 +665,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
@@ -672,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
@@ -701,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
 
@@ -744,6 +826,9 @@ 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 H='| head'
 alias -g P='| perl'
@@ -794,23 +879,19 @@ if (( $+commands[xpdf] )); then
         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
+# Better viewer for info pages .. just pipe everything into less.
+info() {
+    command info "$@" 2>/dev/null | less
 }
 
 
@@ -825,15 +906,28 @@ 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 and empty (no value).
+# 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.
@@ -870,30 +964,108 @@ if [[ $TERM != dumb && $TERM != linux && -z $STY && -z $TMUX ]]; then
     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 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
+# 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() {
     # Display fortunes.
-    (( $+commands[fortune] )) && fortune -ac
+    (( $+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