X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=fb37a6a5ba0b0e58442e51eb2543af10d72fdfd3;hb=ea83a5064cd887af82ffafe8767fcfb5682a371f;hp=7b0e7d24ac41708318b720f4c543b470440c7846;hpb=ce883f49812af309c29b1a5c532a171175e99f08;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 7b0e7d2..fb37a6a 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -60,8 +60,9 @@ 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}'
+# Try uppercase if the currently typed string doesn't match. This allows
+# typing in lowercase most of the time and completion fixes the case.
+zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}'
 # Ignore completion functions.
 zstyle ':completion:*:functions' ignored-patterns '_*'
 # Ignore parent directory.
@@ -71,6 +72,11 @@ 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'
+# When unsetting variables make sure every variable name is only suggested
+# once.
+zstyle ':completion:*:unset:*' ignore-line yes
+# When working with mercurial don't complete the same file multiple times.
+zstyle ':completion:*:hg*:*' ignore-line yes
 
 # Enable zsh's extended glob abilities.
 setopt extendedglob
@@ -97,6 +103,30 @@ alias -g D='2>&1 | colordiff L'
 # Simplify calls to grep.
 alias -g G='| grep'
 
+# Automatically use unified diffs.
+alias diff='diff -u'
+
+# Display all files and use human readable sizes.
+alias du='du -sh'
+
+# Multiple files given to Vim are opened in tabs.
+alias vim='vim -p'
+# Shortcuts for Vim.
+alias v='vim'
+alias vi='vim'
+
+# Exit binding like in Vim.
+alias :q='exit'
+
+# Edit the mercurial patch queue series file for the current mercurial
+# repository in Vim. Also change Vim's pwd to the patches directory so other
+# patches can easily be opened.
+alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"'
+
+# Make going up directories simple.
+alias -g ...='../..'
+alias -g ....='../../..'
+
 # Improved ls which displays the files in columns (-C), visualises directories,
 # links and other special files (-F) and pages everything through less (L).
 #
@@ -123,5 +153,7 @@ function ll() {
 }
 
 
+# Load rc file for current OS.
+source_config ~/.zsh os rc $(uname) nolocal
 # Load rc file for current hostname (first part before a dot) or rc.local.
-source_config ~/.zsh "" rc ${$(hostname)//.*/}
+source_config ~/.zsh host rc ${$(hostname)//.*/}