X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=390ce7edba8dba58a2da6d3427f3222e4c64eb34;hb=ee2f021829fff6de616c5839d9a707c44cf950db;hp=b82f75f2447c851f77157db6bb58babda43202f1;hpb=ba733a055d7c26cf7ef37130166e88b6fcd0501e;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index b82f75f..390ce7e 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.
@@ -75,8 +80,8 @@ autoload -Uz add-zsh-hook
 # 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 +89,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 likes 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 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 modes 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 +179,30 @@ 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 windows' name to 'zsh'.
+# 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 used (it's tested if stumpish is available) then the window
-# title is also set in stumpwm using stumpish.
+# and stumpwm is running then the window title is also set in stumpwm using
+# stumpish.
 #
 # 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.
-if [[ $TERM == screen* || $TERM == xterm* ]]; then
-    # Set to a non empty value to reset the window name in the next precmd()
-    # call.
+# 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* || $TERM == rxvt* ]]; then
+    # Is 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
+    # 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
-    # Set to a non empty value when the shell is running as root.
+    # Is set to a non empty value when the shell is running as root.
     if [[ $(id -u) -eq 0 ]]; then
         window_root=yes
     fi
@@ -194,7 +224,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
@@ -218,8 +248,8 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; then
             program_name=!$program_name
         fi
 
-        # Add an at mark at the beginning if running ssh on a different
-        # computer.
+        # Add an at mark at the beginning if running through ssh on a
+        # different computer.
         if [[ -n $SSH_CONNECTION ]]; then
             program_name="@$program_name"
         fi
@@ -236,19 +266,27 @@ 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\\"
@@ -259,7 +297,7 @@ if [[ $TERM == screen* || $TERM == xterm* ]]; 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
     }
@@ -326,9 +364,12 @@ 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
@@ -348,6 +389,7 @@ 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 ...='../..'
@@ -355,6 +397,7 @@ alias -g ....='../../..'
 alias -g .....='../../../..'
 
 # Shortcuts for often used programs.
+alias c='clear'
 alias e='elinks'
 alias g='git'
 alias m='mutt'
@@ -387,9 +430,13 @@ function ll() {
     la -l $*
 }
 
-# Multiple files given to Vim are opened in tabs, supported since Vim 7.
-if [[ ${${${(f)"$(vim --version)"}[1]#VIM - Vi IMproved }%% *} == 7* ]]; then
-    alias vim='vim -p'
+# 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
@@ -410,6 +457,24 @@ alias df='df -h'
 # patches can easily be opened.
 alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"'
 
+# 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 sitaram in
+# #git on Freenode (2009-04-20 15:51).
+gitk() {
+    command gitk \
+        --max-count=200 \
+        $(git rev-parse --symbolic-full-name --remotes --branches) \
+        $@ &
+    disown %command
+}
+# Same for tig (except the disown part as it's no GUI program).
+tig() {
+    command tig \
+        --max-count=200 \
+        $(git rev-parse --symbolic-full-name --remotes --branches) \
+        $@
+}
+
 
 # RUN COMMANDS
 
@@ -418,12 +483,14 @@ alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"'
 # 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
+    # Get running detached sessions.
+    session=$(screen -list | grep 'Detached' | awk '{ print $1; exit }')
     # Create a new session if none is running.
-    if [[ $(screen -list | grep "Detached" | wc -l) == 0 ]]; then
+    if [[ -z $session ]]; then
         screen
     # Reattach to a running session.
     else
-        screen -r
+        screen -r $session
     fi
 fi