X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=e7d243afbe7648004ba6b48291a669e26af7534c;hb=405eab4d875e929911146a95366e40d4a6c5d2b2;hp=618e7d1d9d9a2c72a0bb44e7b1272ca261f5c35e;hpb=9cf091bb3e53c11fea5ba956d724fd8806cd2a0d;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 618e7d1..e7d243a 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
@@ -98,6 +99,17 @@ alias -g G='| grep'
 
 # 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
 }
@@ -111,5 +123,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)//.*/}