X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=1f5e11bcccad3254c3dfdc7c9b693b3a6bbd8d12;hb=773eb272e6e630695f437382973619867fb33a9c;hp=62dcda70c851048031b9ea34a9da1572cab2842b;hpb=6dc6325a0fb158dc92d0f608c05bd7c6b594ab6a;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 62dcda7..1f5e11b 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
 
@@ -95,22 +123,23 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ]]; then
     RPROMPT='${vcs_info_msg_0_}'
 fi
 
-# When screen is used set the name of the window to the currently running
-# program.
+# When screen or xterm 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'.
-if [[ $TERM == screen ]]; then
+if [[ $TERM == screen || $TERM == xterm* ]]; then
     # Set to a non empty value to reset the window name in the next precmd()
     # call.
-    screen_name_reset=yes
+    window_reset=yes
 
-    screen_preexec() {
+    window_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%% *}
@@ -137,26 +166,35 @@ if [[ $TERM == screen ]]; then
         esac
 
         # Set the window name to the currently running program.
-        print -n "\ek$program_name\e\\"
+        window_title "$program_name"
 
         # Tell precmd() to reset the window name when the program stops.
-        screen_name_reset=yes
+        window_reset=yes
     }
 
-    screen_precmd() {
+    window_precmd() {
         # Abort if no window name reset is necessary.
-        [[ -z $screen_name_reset ]] && return
+        [[ -z $window_reset ]] && return
 
         # Reset the window name to 'zsh'.
-        print -n "\ekzsh\e\\"
+        window_title "zsh"
 
         # Just reset the name, so no screen reset necessary for the moment.
-        screen_name_reset=
+        window_reset=
+    }
+
+    # Sets the window title. Works with screen and xterm.
+    window_title() {
+        if [[ $TERM == screen ]]; then
+            print -n "\ek$1\e\\"
+        elif [[ $TERM == xterm* ]]; then
+            print -n "\e]2;$1\e\\"
+        fi
     }
 
     # Add the preexec() and precmd() hooks.
-    add-zsh-hook preexec screen_preexec
-    add-zsh-hook precmd screen_precmd
+    add-zsh-hook preexec window_preexec
+    add-zsh-hook precmd window_precmd
 fi
 
 
@@ -197,7 +235,10 @@ zstyle ':completion:*:unset:*' ignore-line yes
 zstyle ':completion:*:(hg|git)*:*' ignore-line yes
 
 
-# ALIAS AND FUNCTION SETTINGS
+# CUSTOM ALIASES AND FUNCTIONS
+
+# Make sure aliases are expanded when using sudo.
+alias sudo='sudo '
 
 # Simplify calls to less, automatically redirects all output.
 alias -g L='2>&1 | less'
@@ -212,6 +253,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'
@@ -237,8 +281,9 @@ 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).
+# Improved ls which displays the files in columns (-C), visualizes
+# directories, links and other special files (-F) and pages everything through
+# less (L).
 #
 # If available use GNU ls with colorized output. If it isn't available use
 # normal ls which needs CLICOLOR_FORCE so it displays colors when used with a
@@ -262,13 +307,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 and hidden files). 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 +331,7 @@ 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"
+
+# vim: ft=zsh