X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=a7d62cc484ec6f6dec29cff93fe61e9081d4e817;hb=c3ccdced26ff5d9baf36858968701e7b12447cd6;hp=7a94a3e8d559e54d44488770f435aa7f43ad12fd;hpb=f5d7699997ef7aff787306a78fedb874f7ce61c6;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 7a94a3e..a7d62cc 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -1,6 +1,8 @@
 # Zsh configuration file.
 
 
+source_debug "sourcing ~/.zsh/rc"
+
 # MISCELLANEOUS SETTINGS
 
 # Use Vi(m) style key bindings.
@@ -31,11 +33,21 @@ setopt extendedglob
 setopt ignoreeof
 
 
+# FUNCTION SETTINGS
+
+# Set correct fpath to allow loading my functions (including completion
+# functions).
+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)
+
+
 # HISTORY SETTINGS
 
 # Use history and store it in ~/.zsh/history.
-HISTSIZE=1000
-SAVEHIST=1000
+HISTSIZE=5000
+SAVEHIST=5000
 HISTFILE=~/.zsh/history
 # Append to the history file instead of overwriting it and do it immediately
 # when a command is executed.
@@ -66,30 +78,34 @@ PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\
 %(1j.%{${fg[yellow]}%}%j%{${fg[default]}%}.)%(2L.+.)%# \
 %(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )"
 
-# Allow substitutions and expansions in the prompt, necessary for vcs_info.
-setopt promptsubst
-# 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
-# Set style of vcs_info display. The current branch (green) and vcs (blue) is
-# displayed. If there is an special action going on (merge, rebase) it's also
-# displayed (red).
-zstyle ':vcs_info:*' formats \
-"(%{${fg[green]}%}%b%{${fg[default]}%}:\
+# VCS_Info was added in 4.3.9.
+if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then
+    # Allow substitutions and expansions in the prompt, necessary for
+    # vcs_info.
+    setopt promptsubst
+    # 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
+    # Set style of vcs_info display. The current branch (green) and vcs (blue)
+    # is displayed. If there is an special action going on (merge, rebase)
+    # it's also displayed (red).
+    zstyle ':vcs_info:*' formats \
+    "(%{${fg[green]}%}%b%{${fg[default]}%}:\
 %{${fg[blue]}%}%s%{${fg[default]}%})"
-zstyle ':vcs_info:*' actionformats \
-"(%{${fg[green]}%}%b%{${fg[default]}%}/\
+    zstyle ':vcs_info:*' actionformats \
+    "(%{${fg[green]}%}%b%{${fg[default]}%}/\
 %{${fg[red]}%}%a%{${fg[default]}%}:\
 %{${fg[blue]}%}%s%{${fg[default]}%})"
-# Call vcs_info as precmd before every prompt.
-prompt_precmd() {
-    vcs_info
-}
-add-zsh-hook precmd prompt_precmd
+    # Call vcs_info as precmd before every prompt.
+    prompt_precmd() {
+        vcs_info
+    }
+    add-zsh-hook precmd prompt_precmd
 
-# Display the vcs information in the right prompt.
-RPROMPT='${vcs_info_msg_0_}'
+    # Display the vcs information in the right prompt.
+    RPROMPT='${vcs_info_msg_0_}'
+fi
 
 # When screen is used set the name of the window to the currently running
 # program.
@@ -102,14 +118,36 @@ if [[ $TERM == screen ]]; then
     screen_name_reset=yes
 
     screen_preexec() {
-        # Get the application name excluding any arguments.
-        local program_name=${1%% *}
+        # Get the program name with its arguments.
+        local program_name=$1
+        # When sudo is used use real program name instead.
+        if [[ $program_name == sudo* ]]; then
+            program_name=${program_name#sudo }
+        fi
+        # Remove all arguments from the program name.
+        program_name=${program_name%% *}
 
         # 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
 
+        # Change my shortcuts so the real name of the program is displayed.
+        case $program_name in
+            e)
+                program_name=elinks
+                ;;
+            g)
+                program_name=git
+                ;;
+            m)
+                program_name=mutt
+                ;;
+            v|vi)
+                program_name=vim
+                ;;
+        esac
+
         # Set the window name to the currently running program.
         print -n "\ek$program_name\e\\"
 
@@ -136,11 +174,12 @@ fi
 
 # COMPLETION SETTINGS
 
-# Use new completion system.
-autoload -U compinit && compinit
 # Load the complist module which provides additions to completion lists
 # (coloring, scrollable).
 zmodload zsh/complist
+# Use new completion system, store dumpfile in ~/.zsh/cache to prevent
+# cluttering of ~/.
+autoload -U compinit && compinit -d ~/.zsh/cache/zcompdump
 # Make sure the list of possible completions is displayed after pressing <TAB>
 # the first time.
 setopt nolistambiguous
@@ -170,7 +209,7 @@ zstyle ':completion:*:unset:*' ignore-line yes
 zstyle ':completion:*:(hg|git)*:*' ignore-line yes
 
 
-# ALIAS AND FUNCTION SETTINGS
+# CUSTOM ALIASES AND FUNCTIONS
 
 # Simplify calls to less, automatically redirects all output.
 alias -g L='2>&1 | less'
@@ -185,8 +224,10 @@ alias diff='diff -u'
 # Display all files and use human readable sizes.
 alias du='du -sh'
 
-# Multiple files given to Vim are opened in tabs.
-alias vim='vim -p'
+# 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'
+fi
 
 # Shortcuts for often used programs.
 alias e='elinks'
@@ -206,6 +247,7 @@ alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"'
 # Make going up directories simple.
 alias -g ...='../..'
 alias -g ....='../../..'
+alias -g .....='../../../..'
 
 # Improved ls which displays the files in columns (-C), visualizes directories,
 # links and other special files (-F) and pages everything through less (L).
@@ -244,19 +286,17 @@ TRAPINT() {
     return $1
 }
 
-# Execute all periodic functions every hour.
-PERIOD=3600
-# Display TODOs stored in ~/.todo if this file exists. Run every hour to make
-# clear they should be completed ;-).
+# Display TODOs stored in ~/.todo if this file exists.
 todo() {
     if [[ -f ~/.todo ]]; then
         cat ~/.todo | $PAGER
     fi
 }
-add-zsh-hook periodic todo
 
 
 # Load rc file for current OS.
 source_config ~/.zsh os rc $(uname) nolocal
 # Load rc file for current hostname (first part before a dot) or rc.local.
 source_config ~/.zsh host rc ${$(hostname)//.*/}
+
+source_debug "finished sourcing ~/.zsh/rc"