X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=15e3911ec4429d680602498ea347eadd873034dc;hb=77da04c4fc98cf5f1041f6b00c8fbbcbd3db4973;hp=6fd54ee56f040ed7a14e537a7ed82087734ac296;hpb=ff96681b21a7dca0b6f09ea73569e8c74aa3cf8a;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 6fd54ee..15e3911 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -21,7 +21,8 @@ setopt histignoredups
 bindkey "^P" history-beginning-search-backward
 bindkey "^N" history-beginning-search-forward
 
-# Prevent overwriting existing files with '> filename'.
+# Prevent overwriting existing files with '> filename', use '>| filename'
+# (or >!) instead.
 setopt noclobber
 
 # Entering the name of a directory (if it's not a command) will automatically
@@ -36,12 +37,13 @@ setopt correct
 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 exit code of the last command if it wasn't 0, the number of running jobs
+# if not 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
-# code in red and bold.
+# code in red and bold and the job count in yellow.
 PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\
-%{${fg[blue]}%}%B%~%b%{${fg[default]}%} %(2L.+.)%# \
+%{${fg[blue]}%}%B%~%b%{${fg[default]}%} \
+%(1j.%{${fg[yellow]}%}%j%{${fg[default]}%}.)%(2L.+.)%# \
 %(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )"
 
 # Use new completion system.
@@ -95,8 +97,43 @@ 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).
+#
+# If available use GNU ls with colorized output. If it isn't available use
+# normal ls which needs CLICOLOR_FORCE so it displays colors when used with a
+# pager.
+ls --color &> /dev/null
+if [[ $? -eq 0 ]]; then
+    alias ls='ls --color'
+else
+    alias ls='CLICOLOR_FORCE=1 ls -G'
+fi
+# Main ls function.
 function ls() {
     command ls -C -F $* L
 }
@@ -110,11 +147,7 @@ function ll() {
 }
 
 
-# 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
+# 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 host rc ${$(hostname)//.*/}