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

diff --git a/zsh/rc b/zsh/rc
index cebbbf9..5d20a45 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -45,38 +45,61 @@ 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
 
-# If ^C is pressed while typing a command, copy it in the kill buffer so it can
-# be "yanked" 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 typing
-# the command.
+# 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
+# typing the command.
 TRAPINT() {
-    # Kill the current buffer so it gets stored and can be retrieved later with
-    # "yank". Then yank it so it gets displayed (otherwise I don't know which
-    # command I aborted).
-    zle && zle kill-buffer && zle yank
+    # Store the current buffer in the history.
+    zle && print -s $BUFFER
 
-    # Return the default exit code so zsh aborts the current command line.
+    # Return the default exit code so zsh aborts the current command.
     return $1
 }
-# Make sure ^Y is bound to yank, necessary for the TRAPINT function to work as
-# excepted.
-bindkey "^Y" yank
 
+# Simplify calls to less, automatically redirects all output.
+alias -g L='2>&1 | less'
+# Simplify calls to colordiff, output is also piped through less.
+alias -g D='2>&1 | colordiff L'
+# Simplify calls to grep.
+alias -g G='| grep'
 
-# 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.
+# 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 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