Simplify configuration setup.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index 9dd47a49795fa36538169d996a331b5a3f7cc9aa..e0bf4c76a737f9aeb105b796c5eb4e1635c87ef5 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -1,7 +1,7 @@
 # Zsh configuration file.
 
 
-source_debug "sourcing ~/.zsh/rc"
+source_debug ". ~/.zsh/rc"
 
 # MISCELLANEOUS SETTINGS
 
@@ -246,7 +246,7 @@ fi
 
 # Set the prompt. A two line prompt is used. On the top left the current
 # working directory is displayed, on the right vcs_info (if available). On the
-# bottom left current username and host is shown, the exit code of the last
+# bottom left current user name and host is shown, the exit code of the last
 # command if it wasn't 0, the number of running jobs if not 0.
 #
 # The prompt is in green and blue to make easily detectable, the error exit
@@ -373,6 +373,9 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
             # in the term/outer screen.
             if [[ $program_name == @screen ]]; then
                 program_name="@:${$(hostname)//.*/}"
+            # Use "@:!hostname" for root screens.
+            elif [[ $program_name == @!screen ]]; then
+                program_name="@:!${$(hostname)//.*/}"
             fi
         fi
 
@@ -408,14 +411,16 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
         window_reset=
     }
 
-    # Sets the window title. Works with screen, xterm and rxvt.
+    # Sets the window title. Works with screen, xterm and rxvt. (V) escapes
+    # all non-printable characters. Thanks to Mikachu in #zsh on Freenode
+    # (2010-08-07 17:09 CEST).
     if [[ $TERM == screen* ]]; then
         window_title() {
-            print -n "\ek$1\e\\"
+            print -n "\ek${(V)1}\e\\"
         }
     elif [[ $TERM == xterm* || $TERM == rxvt* ]]; then
         window_title() {
-            print -n "\e]2;$1\e\\"
+            print -n "\e]2;${(V)1}\e\\"
         }
     else
         # Fallback if another TERM is used.
@@ -425,6 +430,10 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
     # Add the preexec() and precmd() hooks.
     add-zsh-hook preexec window_preexec
     add-zsh-hook precmd window_precmd
+else
+    # Fallback if another TERM is used, necessary to run screen (see below in
+    # "RUN COMMANDS").
+    window_preexec() { }
 fi
 
 
@@ -479,6 +488,16 @@ zstyle ':completion:*' ignore-line yes
 # Except for mv and cp, because I often want to use to similar names, so I
 # complete to the same and change it.
 zstyle ':completion:*:(mv|cp):*' ignore-line no
+# Don't complete ./config.* files, this makes running ./configure much
+# simpler. Thanks to Nomexous in #zsh on Freenode (2010-03-16 01:54)
+zstyle ':completion:*:*:-command-:*' ignored-patterns './config.*'
+
+# Provide a fallback completer which always completes files. Useful when Zsh's
+# completion is too "smart". Thanks to Frank Terbeck <ft@bewatermyfriend.org>
+# (http://www.zsh.org/mla/users/2009/msg01038.html).
+zle -C complete-files complete-word _generic
+zstyle ':completion:complete-files:*' completer _files
+bindkey '^F' complete-files
 
 
 # CUSTOM ALIASES AND FUNCTIONS
@@ -500,12 +519,12 @@ TRAPINT() {
     return $1
 }
 
-# Colorize stderr. Very useful when looking for errors. Thanks to
+# Colorize stderr in red. Very useful when looking for errors. Thanks to
 # http://gentoo-wiki.com/wiki/Zsh for the basic script and Mikachu in #zsh on
 # Freenode (2010-03-07 04:03) for some improvements (-r, printf). It's not yet
 # perfect and doesn't work with su and git for example, but it can handle most
-# interactive output quite well (even with no trailing new line) and in those
-# cases the E alias can be used as workaround.
+# interactive output quite well (even with no trailing new line) and in cases
+# it doesn't work, the E alias can be used as workaround.
 exec 2>>(while read -r -k -u 0 line; do
     printf '\e[91m%s\e[0m' "$line";
     print -n $'\0';
@@ -594,8 +613,7 @@ fi
 
 # LOAD ADDITIONAL CONFIGURATION FILES
 
-# Load rc file for current hostname (first part before a dot) or rc.local.
-source_config ~/.zsh host rc ${$(hostname)//.*/}
+source_config ~/.zsh.rc.local
 
 
 # RUN COMMANDS
@@ -619,6 +637,6 @@ if [[ $TERM != dumb && -z $STY ]]; then
 fi
 
 
-source_debug "finished sourcing ~/.zsh/rc"
+source_debug ". ~/.zsh/rc (done)"
 
 # vim: ft=zsh