X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=f936b91ad2144408044479d5b12334a355a4faff;hb=043a26ea99d84d11423b2dc53949a2df518d2c35;hp=993f447fff1925a855115cd096f2f3161c451dbd;hpb=d3c01c00fa7481cfdbeda6be88cc245aaa3c0545;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 993f447..f936b91 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -41,9 +41,12 @@ autoload ${fpath[1]}/^_*(^/:t)
 
 # Simulate hooks using _functions arrays for Zsh versions older then 4.3.4. At
 # the moment only precmd() and preexec() are simulated.
-if [[ $ZSH_VERSION != (4.3.<4->|4.<4->*|<5->*) ]]; then
+#
+# 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=($fpath ~/.zsh/functions/compatibility)
+    fpath=(~/.zsh/functions/compatibility $fpath)
 
     # Run all functions defined in the ${precmd,preexec}_functions arrays.
     function precmd() {
@@ -128,10 +131,19 @@ fi
 #
 # When a program is started preexec() sets the window's name to it; when it
 # stops precmd() resets the windows' name to 'zsh'.
-if [[ $TERM == screen || $TERM == xterm* ]]; then
+#
+# It works with screen and xterm. If screen is running in X11 (DISPLAY is set)
+# and stumpwm is used (it's tested if stumpish is available) then the window
+# title is also set in stumpwm using stumpish.
+if [[ $TERM == screen* || $TERM == xterm* ]]; then
     # Set to a non empty value to reset the window name in the next precmd()
     # call.
     window_reset=yes
+    # Set to a non empty value when the stump window manager is available.
+    which stumpwm &> /dev/null
+    if [[ $? -eq 0 ]]; then
+        window_stumpwm=yes
+    fi
 
     window_preexec() {
         # Get the program name with its arguments.
@@ -166,11 +178,7 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then
         esac
 
         # Set the window name to the currently running program.
-        if [[ $TERM == screen ]]; then
-            print -n "\ek$program_name\e\\"
-        elif [[ $TERM == xterm* ]]; then
-            print -n "\e]2;$program_name\e\\"
-        fi
+        window_title "$program_name"
 
         # Tell precmd() to reset the window name when the program stops.
         window_reset=yes
@@ -181,16 +189,28 @@ if [[ $TERM == screen || $TERM == xterm* ]]; then
         [[ -z $window_reset ]] && return
 
         # Reset the window name to 'zsh'.
-        if [[ $TERM == screen ]]; then
-            print -n "\ekzsh\e\\"
-        elif [[ $TERM == xterm* ]]; then
-            print -n "\e]2;zsh\e\\"
-        fi
+        window_title "zsh"
 
         # Just reset the name, so no screen reset necessary for the moment.
         window_reset=
     }
 
+    # Sets the window title. Works with screen and xterm.
+    window_title() {
+        if [[ $TERM == screen* ]]; then
+            print -n "\ek$1\e\\"
+
+            # Update window name in stumpwm if running screen in X11 and when
+            # stumpwm is used.
+            if [[ -n $DISPLAY && -n $window_stumpwm ]]; then
+                echo "$1" | stumpish -e "title" > /dev/null
+            fi
+
+        elif [[ $TERM == xterm* ]]; then
+            print -n "\e]2;$1\e\\"
+        fi
+    }
+
     # Add the preexec() and precmd() hooks.
     add-zsh-hook preexec window_preexec
     add-zsh-hook precmd window_precmd
@@ -205,27 +225,40 @@ zmodload zsh/complist
 # Use new completion system, store dumpfile in ~/.zsh/cache to prevent
 # cluttering of ~/.
 autoload -U compinit && compinit -d ~/.zsh/cache/zcompdump
+
+# Use cache to speed up completions.
+zstyle ':completion:*' use-cache on
+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 <TAB>
 # the first time.
 setopt nolistambiguous
 # Allow completions in the middle of a text, i.e. "/usr/bin/<TAB>whatever"
 # completes like "/usr/bin/<TAB>". Useful when adding new options to commands.
 bindkey "^I" expand-or-complete-prefix
-# Use cache to speed up completions.
-zstyle ':completion:*' use-cache on
-zstyle ':completion:*' cache-path ~/.zsh/cache
 # 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}'
-# Ignore completion functions.
-zstyle ':completion:*:functions' ignored-patterns '_*'
-# Ignore parent directory.
-zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
+
 # 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:'
+# Display different types of matches separately.
+zstyle ':completion:*' group-name ''
+
+# Ignore completion functions.
+zstyle ':completion:*:functions' ignored-patterns '_*'
+# Ignore parent directory.
+zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
 # When unsetting variables make sure every variable name is only suggested
 # once.
 zstyle ':completion:*:unset:*' ignore-line yes
@@ -236,6 +269,9 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes
 
 # CUSTOM ALIASES AND FUNCTIONS
 
+# Make sure aliases are expanded when using sudo.
+alias sudo='sudo '
+
 # Simplify calls to less, automatically redirects all output.
 alias -g L='2>&1 | less'
 # Simplify calls to colordiff, output is also piped through less.
@@ -264,8 +300,9 @@ alias m='mutt'
 alias v='vim'
 alias vi='vim'
 
-# Exit binding like in Vim; I sometimes confuse editor and shell.
-alias :q='exit'
+# I sometimes confuse editor and shell, print a warning to prevent I exit the
+# shell.
+alias :q='echo "This is not Vim!" >&2'
 
 # Edit the mercurial patch queue series file for the current mercurial
 # repository in Vim. Also change Vim's pwd to the patches directory so other
@@ -322,6 +359,28 @@ todo() {
     fi
 }
 
+# Colorize stderr. Very useful when looking for errors. Thanks to
+# http://gentoo-wiki.com/wiki/Zsh
+exec 2>>(while read line; do
+    print '\e[91m'${(q)line}'\e[0m' > /dev/tty; print -n $'\0'; done &)
+
+
+# RUN COMMANDS
+
+# If not already in screen reattach to a running session or create a new one.
+#
+# screen* is necessary as `screen` uses screen.linux for example for a linux
+# console which would otherwise cause an infinite loop.
+if [[ $TERM != screen* && $TERM != 'dumb' ]]; then
+    # Create a new session if none is running.
+    if [[ $(screen -list | grep "Detached" | wc -l) == 0 ]]; then
+        screen
+    # Reattach to a running session.
+    else
+        screen -r
+    fi
+fi
+
 
 # Load rc file for current OS.
 source_config ~/.zsh os rc $(uname) nolocal