X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=5d20a458d5855f1cb2ade92d5d94c16358444a04;hb=15483177a0e457dfae6a44caed7392ca3762de5c;hp=088c53dc6d9798990241a7c1847f8cc58505fa88;hpb=0d7d2c9487bf24344eb3798e92d0f089ecb08efa;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 088c53d..5d20a45 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -45,11 +45,18 @@ autoload -U compinit && compinit
 # Make sure the list of possible completions is displayed after pressing <TAB>
 # the first time.
 setopt nolistambiguous
+# Allow completions in the middle of a text, i.e. "/usr/bin/<TAB>whatever"
+# completes like "/usr/bin/<TAB>". Useful when adding new options to commands.
+bindkey "^I" expand-or-complete-prefix
 # Use cache to speed up completions.
 zstyle ':completion:*' use-cache on
 zstyle ':completion:*' cache-path ~/.zsh/cache
 # Ignore case if currently typed string doesn't match.
 zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}'
+# Ignore completion functions.
+zstyle ':completion:*:functions' ignored-patterns '_*'
+# Ignore parent directory.
+zstyle ':completion:*:(cd|mv|cp):*' ignore-parents parent pwd
 
 # Enable zsh's extended glob abilities.
 setopt extendedglob
@@ -73,12 +80,26 @@ alias -g D='2>&1 | colordiff L'
 # Simplify calls to grep.
 alias -g G='| grep'
 
+# Improved ls which displays the files in columns (-C), visualises directories,
+# links and other special files (-F) and pages everything through less (L).
+function ls() {
+    command ls -C -F $* L
+}
+# Helper function to list all files.
+function la() {
+    ls -a $*
+}
+# Helper function to list all files in list format with access rights, etc.
+function ll() {
+    la -l $*
+}
 
-# If a rc.local file exists load it, otherwise load a rc file for the current
-# hostname (first part before a dot) if it exists.
+
+# 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.local ]]; then;
-    source ~/.zsh/rc.local
-elif [[ -f ~/.zsh/rc.$host ]]; then;
+if [[ -f ~/.zsh/rc.$host ]]; then;
     source ~/.zsh/rc.$host
+elif [[ -f ~/.zsh/rc.local ]]; then;
+    source ~/.zsh/rc.local
 fi