X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=3c4234be89931d95530895a2f9d9011e56e691c8;hb=750e1cf656be5048bd72b8a9f19bea83fc396e16;hp=2104c4eebd6ea0d77fcbe81e69953cd71cee1806;hpb=003a8453597d05c6a47b244ce15bfc6672ff2d6a;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 2104c4e..3c4234b 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.
@@ -9,9 +11,6 @@ bindkey -v
 # Be paranoid, new files are readable/writable by me only.
 umask 077
 
-# Make sure core dumps are created.
-ulimit -c unlimited
-
 # Prevent overwriting existing files with '> filename', use '>| filename'
 # (or >!) instead.
 setopt noclobber
@@ -31,11 +30,43 @@ 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)
+
+# 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
+    # Provide add-zsh-hook which was added in 4.3.4.
+    fpath=($fpath ~/.zsh/functions/compatibility)
+
+    # Run all functions defined in the ${precmd,preexec}_functions arrays.
+    function precmd() {
+        for function in $precmd_functions; do
+            $function $@
+        done
+    }
+    function preexec() {
+        for function in $preexec_functions; do
+            $function $@
+        done
+    }
+fi
+
+# Autoload add-zsh-hook to add/remove zsh hook functions easily.
+autoload -Uz add-zsh-hook
+
+
 # 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.
@@ -50,9 +81,6 @@ bindkey "^N" history-beginning-search-forward
 
 # PROMPT SETTINGS
 
-# Autoload add-zsh-hook to add/remove zsh hook functions easily.
-autoload -Uz add-zsh-hook
-
 # Use colorized output, necessary for prompts and completions.
 autoload -U colors && colors
 
@@ -66,30 +94,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,8 +134,15 @@ 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, but with an
+        # exclamation mark at the beginning.
+        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
@@ -152,11 +191,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
@@ -186,7 +226,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'
@@ -201,8 +241,13 @@ 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'
+# Use human readable sizes.
+alias df='df -h'
+
+# 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'
@@ -261,19 +306,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"