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

diff --git a/zsh/rc b/zsh/rc
index 298cab3..5d20a45 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
@@ -34,22 +34,72 @@ 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.
-# The prompt is in green and blue to make easily detectable, The error exit
+# The prompt is in green and blue to make easily detectable, the error exit
 # code in red and bold.
 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>
+# 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
-# Also match uppercase names when typed only lowercase.
-zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
+# 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
+setopt extendedglob
+
+# 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() {
+    # Store the current buffer in the history.
+    zle && print -s $BUFFER
+
+    # Return the default exit code so zsh aborts the current command.
+    return $1
+}
+
+# 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 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