X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=f01c5ff2e3b93c6eb8871a07485372ece8253caf;hb=0cc191ec23888f102fa6ab82b963e0bcfcaa2e79;hp=3e3be66c705cc1791e4961ffdb8442f8b434f2fd;hpb=e7a3c318b08b49226645028285f1a245484b319a;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 3e3be66..f01c5ff 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -11,6 +11,9 @@ bindkey -v
 # Be paranoid, new files are readable/writable by me only.
 umask 077
 
+# Disable beeps.
+setopt nobeep
+
 # Prevent overwriting existing files with '> filename', use '>| filename'
 # (or >!) instead.
 setopt noclobber
@@ -44,7 +47,9 @@ fi
 fpath=(~/.zsh/functions $fpath)
 # Autoload my functions (except completion functions and hidden files). Thanks
 # to caphuso from the Zsh example files for this idea.
-autoload ${fpath[1]}/^_*(^/:t)
+if [[ -d ~/.zsh/functions ]]; then
+    autoload ${fpath[1]}/^_*(^/:t)
+fi
 
 # Simulate hooks using _functions arrays for Zsh versions older than 4.3.4. At
 # the moment only precmd() and preexec() are simulated.
@@ -71,12 +76,14 @@ fi
 # Autoload add-zsh-hook to add/remove zsh hook functions easily.
 autoload -Uz add-zsh-hook
 
+# Load zmv (zsh move) which is powerful to rename files.
+autoload zmv
 
 # HISTORY SETTINGS
 
 # Use history and store it in ~/.zsh/history.
-HISTSIZE=5000
-SAVEHIST=5000
+HISTSIZE=50000
+SAVEHIST=50000
 HISTFILE=~/.zsh/history
 # Append to the history file instead of overwriting it and do it immediately
 # when a command is executed.
@@ -84,9 +91,33 @@ setopt appendhistory
 setopt incappendhistory
 # If the same command is run multiple times store it only once in the history.
 setopt histignoredups
-# Vim like completions of previous executed commands.
-bindkey "^P" history-beginning-search-backward
-bindkey "^N" history-beginning-search-forward
+# 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 are
+# returned. Very useful to get old commands quickly. Thanks to Mikachu in #zsh
+# on Freenode (2010-01-17 12:47) for the information how to a use function
+# with bindkey.
+zle -N my-vi-history-beginning-search-backward
+my-vi-history-beginning-search-backward() {
+    local not_at_beginning_of_line
+    if [[ $CURSOR -ne 0 ]]; then
+        not_at_beginning_of_line=yes
+    fi
+
+    zle history-beginning-search-backward
+
+    # Start Vi-mode and stay at the same position (Vi-mode moves one left,
+    # this counters it).
+    zle vi-cmd-mode
+    if [[ -n $not_at_beginning_of_line ]]; then
+        zle vi-forward-char
+    fi
+}
+bindkey "^P" my-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
 
 
 # PROMPT SETTINGS
@@ -150,29 +181,22 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
     fi
 fi
 
-# When screen or xterm is used set the name of the window to the currently
-# running program.
+# When screen, 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'.
 #
-# It works with screen and xterm. If screen is running in X11 (DISPLAY is set)
-# and stumpwm is running then the window title is also set in stumpwm using
-# stumpish.
+# It works with screen, 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. This
 # only works if the .zshrc on the server also uses this command.
-if [[ $TERM == screen* || $TERM == xterm* ]]; then
+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 stump window manager is running.
-    ps aux | grep -q stumpwm | grep -v grep
-    if [[ $? -eq 0 ]]; then
-        window_stumpwm=yes
-    fi
     # Is set to a non empty value when the shell is running as root.
     if [[ $(id -u) -eq 0 ]]; then
         window_root=yes
@@ -183,7 +207,7 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
         local program_name=$1
 
         # When sudo is used use real program name instead, but with an
-        # exclamation mark at the beginning.
+        # exclamation mark at the beginning (handled below).
         local program_sudo=
         if [[ $program_name == sudo* ]]; then
             program_name=${program_name#sudo }
@@ -195,7 +219,7 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
         # Ignore often used commands which are only running for a very short
         # time. This prevents a "blinking" name when it's changed to "cd" for
         # example and then some milliseconds later back to "zsh".
-        [[ $program_name == (cd*|ls|la|ll|clear) ]] && return
+        [[ $program_name == (cd*|ls|la|ll|clear|c) ]] && return
 
         # Change my shortcuts so the real name of the program is displayed.
         case $program_name in
@@ -237,30 +261,32 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
         [[ -z $window_reset ]] && return
 
         # Reset the window name to 'zsh'.
+        local name="zsh"
+        # If the function was called with an argument then reset the window
+        # name to '.zsh' (used by clear alias).
+        if [[ -n $1 ]]; then
+            name=".zsh"
+        fi
+
+        # Prepend prefixes like in window_preexec().
         if [[ -n $SSH_CONNECTION ]]; then
-            window_title "@zsh"
+            window_title "@$name"
         elif [[ -n $window_root ]]; then
-            window_title "!zsh"
+            window_title "!$name"
         else
-            window_title "zsh"
+            window_title $name
         fi
 
         # Just reset the name, so no screen reset necessary for the moment.
         window_reset=
     }
 
-    # Sets the window title. Works with screen and xterm.
+    # Sets the window title. Works with screen, xterm and rxvt.
     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
+        elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then
             print -n "\e]2;$1\e\\"
         fi
     }
@@ -270,15 +296,6 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
     add-zsh-hook precmd window_precmd
 fi
 
-# If the window naming feature is used (see above) then use ".zsh" (leading
-# dot) as title name after running clear so it's clear to me that the window
-# 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_title .zsh'
-fi
-
 
 # COMPLETION SETTINGS
 
@@ -286,7 +303,8 @@ fi
 # (coloring, scrollable).
 zmodload zsh/complist
 # Use new completion system, store dumpfile in ~/.zsh/cache to prevent
-# cluttering of ~/.
+# cluttering of ~/. $fpath must be set before calling this. Thanks to Adlai in
+# #zsh on Freenode (2009-08-07 21:05) for reminding me of the $fpath problem.
 autoload -U compinit && compinit -d ~/.zsh/cache/zcompdump
 
 # Use cache to speed up completions.
@@ -336,28 +354,37 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes
 # easily retrieved later and then abort like ^C normally does. This is useful
 # when I want to abort an command to do something in between and then finish
 # typing the command.
+#
+# Thanks to Vadim Zeitlin <vz-zsh@zeitlins.org> for a fix (--) so lines
+# starting with - don't cause errors.
 TRAPINT() {
     # Store the current buffer in the history.
-    zle && print -s $BUFFER
+    zle && print -s -- $BUFFER
 
     # Return the default exit code so zsh aborts the current command.
     return $1
 }
 
 # 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 &)
+# http://gentoo-wiki.com/wiki/Zsh for the basic script and Mikachu in #zsh on
+# Freenode (2010-03-07 04:03) for some improvements (-r, printf). It's not yet
+# perfect and doesn't work with some interactive stderr output, but in those
+# cases the E alias can be used as workaround.
+exec 2>>(while read -r line; do
+    printf '\e[91m%s\e[0m\n' "$line"
+    print -n $'\0';
+done &)
 
 # Make sure aliases are expanded when using sudo.
 alias sudo='sudo '
 
-# Global aliases for often used commands used in the command line.
+# Global aliases for often used commands in the command line.
 alias -g E='2>&1'
 alias -g L='E | less'
 alias -g D='E | colordiff L'
 alias -g G='| grep'
 alias -g S='| sort'
+alias -g U='| uniq'
 
 # Make going up directories simple.
 alias -g ...='../..'
@@ -365,6 +392,7 @@ alias -g ....='../../..'
 alias -g .....='../../../..'
 
 # Shortcuts for often used programs.
+alias c='clear'
 alias e='elinks'
 alias g='git'
 alias m='mutt'
@@ -397,6 +425,15 @@ function ll() {
     la -l $*
 }
 
+# If the window naming feature is used (see above) then use ".zsh" (leading
+# dot) as title name after running clear so it's clear to me that the window
+# 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'
+fi
+
 # I sometimes confuse editor and shell, print a warning to prevent I exit the
 # shell.
 alias :q='echo "This is not Vim!" >&2'
@@ -453,8 +490,34 @@ if [[ $TERM != screen* && $TERM != 'dumb' ]]; then
 fi
 
 
-# Load rc file for current OS.
-source_config ~/.zsh os rc $(uname) nolocal
+# OS SPECIFIC SETTINGS
+
+if [[ $(uname) == Linux ]]; then
+    # Settings when creating Debian packages.
+    DEBEMAIL=simon@ruderich.org
+    export DEBEMAIL
+    DEBFULLNAME="Simon Ruderich"
+    export DEBFULLNAME
+
+elif [[ $(uname) == Darwin ]]; then # Mac OS X
+    # Store the current clipboard in CLIPBOARD before every command so it can
+    # be used in commands.
+    os_darwin_preexec() {
+        export CLIPBOARD="$(pbpaste)"
+    }
+    # Add the function as preexec hook.
+    add-zsh-hook preexec os_darwin_preexec
+
+    # Initialize CLIPBOARD so it's available for completion directly after
+    # startup.
+    CLIPBOARD=""
+    export CLIPBOARD
+
+    # Fetch current URL in clipboard with wget.
+    alias wnc='wget --no-proxy $CLIPBOARD'
+fi
+
+
 # Load rc file for current hostname (first part before a dot) or rc.local.
 source_config ~/.zsh host rc ${$(hostname)//.*/}