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

diff --git a/zsh/rc b/zsh/rc
index a13c020..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,6 +30,38 @@ 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.
@@ -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
 
@@ -108,9 +136,10 @@ if [[ $TERM == screen ]]; then
     screen_preexec() {
         # Get the program name with its arguments.
         local program_name=$1
-        # When sudo is used use real program name instead.
+        # 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 }
+            program_name=!${program_name#sudo }
         fi
         # Remove all arguments from the program name.
         program_name=${program_name%% *}
@@ -197,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'
@@ -212,6 +241,9 @@ alias diff='diff -u'
 # Display all files and use human readable sizes.
 alias du='du -sh'
 
+# 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'
@@ -262,13 +294,6 @@ function ll() {
     la -l $*
 }
 
-# Set correct fpath to allow loading my functions (including completion
-# functions).
-fpath=(~/.zsh/functions $fpath)
-# Autoload my functions (except completion functions). Thanks to caphuso from
-# the Zsh example files for this idea.
-autoload ${fpath[1]}/^_*(:t)
-
 # If ^C is pressed while typing a command, add it to the history so it can be
 # 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
@@ -293,3 +318,5 @@ todo() {
 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"