X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=9b42bd102848da812253495902a5aa12607c347a;hb=7bbe37b9e655745432f0b7784d37a9595f7e9d77;hp=17fb0cb34cd60d266566f7dd38a93d6a81e2e3fa;hpb=ed89ce91a7a93203fad6eb3da8192a822734e1ba;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 17fb0cb..9b42bd1 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -4,7 +4,7 @@
 # Use Vi(m) style key bindings.
 bindkey -v
 
-# Use the history and store it in ~/.zsh/history.
+# Use history and store it in ~/.zsh/history.
 HISTSIZE=1000
 SAVEHIST=1000
 HISTFILE=~/.zsh/history
@@ -29,8 +29,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.
@@ -40,43 +41,74 @@ PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\
 %{${fg[blue]}%}%B%~%b%{${fg[default]}%} %(2L.+.)%# \
 %(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )"
 
-# Use the new completion system.
+# Use new completion system.
 autoload -U compinit && compinit
-# Make sure the list of possible completions is displayed after pressing <Tab>
+# 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
-# Use a cache to speed up completions.
+# 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 the case if the currently typed string doesn't match.
+# 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
+# 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
 
-# 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'
+
+# 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