From 08fcf7dc393d6254fdcd7eef26d3f4ddd1c53a6c Mon Sep 17 00:00:00 2001
From: Toon Claes <toon@tonotdo.com>
Date: Thu, 5 Nov 2009 20:44:28 +0100
Subject: [PATCH] Enabled colors in ls and made it possible to theme them

---
 lib/aliases.zsh              |  3 +--
 lib/appearance.zsh           | 21 ++++++++++++---------
 templates/zshrc.zsh-template |  5 ++++-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index c3a6cf073..88d68e142 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -45,8 +45,7 @@ alias gcp='git cherry-pick'
 alias history='fc -l 1'
 
 # List direcory contents
-alias ls='ls -F -G'
-alias lsa='ls -lahG'
+alias lsa='ls -lah'
 alias l='ls -la'
 alias ll='ls -alr'
 alias sl=ls # often screw this up
diff --git a/lib/appearance.zsh b/lib/appearance.zsh
index b1f5a8a38..c9bd25d81 100644
--- a/lib/appearance.zsh
+++ b/lib/appearance.zsh
@@ -1,6 +1,13 @@
-# Colors
+# ls colors
 autoload colors; colors;
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
+#export LS_COLORS
+
+# Enable ls colors
+if [ "$DISABLE_LS_COLORS" != "true" ] then
+  # Find the option for using colors in ls, depending on the version: Linux or BSD
+  ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
+fi
 
 #setopt no_beep
 setopt auto_cd
@@ -18,14 +25,10 @@ fi
 PS1="%n@%m:%~%# "
 
 # git theming default: Variables for theming the git info prompt
-# ZSH_THEME_GIT_PROMPT_PREFIX - Prefix at the very beginning of the prompt, before the branch name
-ZSH_THEME_GIT_PROMPT_PREFIX="git:("
-# ZSH_THEME_GIT_PROMPT_SUFFIX - At the very end of the prompt
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
-# ZSH_THEME_GIT_PROMPT_DIRTY  - Text to display if the branch is dirty
-ZSH_THEME_GIT_PROMPT_DIRTY="*"
-# ZSH_THEME_GIT_PROMPT_CLEAN  - Text to display if the branch is clean
-ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_PREFIX="git:("         # Prefix at the very beginning of the prompt, before the branch name
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"             # At the very end of the prompt
+ZSH_THEME_GIT_PROMPT_DIRTY="*"              # Text to display if the branch is dirty
+ZSH_THEME_GIT_PROMPT_CLEAN=""               # Text to display if the branch is clean
 
 # Setup the prompt with pretty colors
 setopt prompt_subst
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 7c43303bd..d905be04b 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -9,7 +9,10 @@ export ZSH_THEME="robbyrussell"
 # export CASE_SENSITIVE="true"
 
 # Comment this out to disable weekly auto-update checks
-# export DISABLE_AUTO_UPDATE="false"
+# export DISABLE_AUTO_UPDATE="true"
+
+# Uncomment following line if you want to disable colors in ls
+# export DISABLE_LS_COLORS="true"
 
 source $ZSH/oh-my-zsh.sh