X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=34c99556274dcb3543d72d76dbbf04d8fa7ae385;hb=e4506773c2b11bde762743bde5cfb0b4cc429010;hp=52318bc88e50e3c2c72864c4042805bed1ca4a01;hpb=0f76f93bd286c46d281a574a6db67e038b6d42a7;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 52318bc..34c9955 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,29 @@ alias -g D='2>&1 | colordiff L'
 # Simplify calls to grep.
 alias -g G='| grep'
 
+# 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'
+
+
 # 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 +133,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)//.*/}