Simplified loading of config files by using a function.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index 5d20a458d5855f1cb2ade92d5d94c16358444a04..52318bc88e50e3c2c72864c4042805bed1ca4a01 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -4,6 +4,9 @@
 # Use Vi(m) style key bindings.
 bindkey -v
 
+# Be paranoid, new files are readable/writable by me only.
+umask 077
+
 # Use history and store it in ~/.zsh/history.
 HISTSIZE=1000
 SAVEHIST=1000
@@ -29,8 +32,9 @@ setopt autocd
 # one.
 setopt correct
 
-# Use colorized output.
+# Use colorized output, necessary for prompts and completions.
 autoload -U colors && colors
+
 # Set the default prompt. The current host and working directory is displayed,
 # the exit code of the last command if it wasn't 0 and a + if this shell is
 # running inside another shell.
@@ -42,6 +46,9 @@ PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\
 
 # Use new completion system.
 autoload -U compinit && compinit
+# Load the complist module which provides additions to completion lists
+# (coloring, scrollable).
+zmodload zsh/complist
 # Make sure the list of possible completions is displayed after pressing <TAB>
 # the first time.
 setopt nolistambiguous
@@ -57,10 +64,18 @@ zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}'
 zstyle ':completion:*:functions' ignored-patterns '_*'
 # Ignore parent directory.
 zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
+# Use ls like colors for completions.
+zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
+# Make completion lists scrollable so "do you wish to see all n possibilities"
+# is no longer displayed.
+zstyle ':completion:*' list-prompt '%p'
 
 # Enable zsh's extended glob abilities.
 setopt extendedglob
 
+# Don't exit if <C-d> is pressed.
+setopt ignoreeof
+
 # 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
@@ -95,11 +110,5 @@ function ll() {
 }
 
 
-# If a rc file for the current hostname (first part before a dot) exists load
-# it, otherwise load rc.local if available.
-host=${$(hostname)//.*/}
-if [[ -f ~/.zsh/rc.$host ]]; then;
-    source ~/.zsh/rc.$host
-elif [[ -f ~/.zsh/rc.local ]]; then;
-    source ~/.zsh/rc.local
-fi
+# Load rc file for current hostname (first part before a dot) or rc.local.
+source_config ~/.zsh "" rc ${$(hostname)//.*/}