X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=fb37a6a5ba0b0e58442e51eb2543af10d72fdfd3;hb=ea83a5064cd887af82ffafe8767fcfb5682a371f;hp=52318bc88e50e3c2c72864c4042805bed1ca4a01;hpb=0f76f93bd286c46d281a574a6db67e038b6d42a7;p=config%2Fdotfiles.git diff --git a/zsh/rc b/zsh/rc index 52318bc..fb37a6a 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. @@ -58,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. @@ -69,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 @@ -95,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 } @@ -110,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)//.*/}