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

diff --git a/zsh/rc b/zsh/rc
index 5d20a45..fb37a6a 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -4,6 +4,9 @@
 # Use Vi(m) style key bindings.
 bindkey -v
 
+# Be paranoid, new files are readable/writable by me only.
+umask 077
+
 # Use history and store it in ~/.zsh/history.
 HISTSIZE=1000
 SAVEHIST=1000
@@ -18,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
@@ -29,19 +33,24 @@ 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.
+# 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.
 autoload -U compinit && compinit
+# 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
@@ -51,16 +60,30 @@ 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.
 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'
+# 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
 
+# Don't exit if <C-d> is pressed.
+setopt ignoreeof
+
 # 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
@@ -80,8 +103,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
 }
@@ -95,11 +153,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)//.*/}