From 066fbbef78749a97a4b2285654c79a64c7255828 Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Tue, 29 Jul 2014 13:08:35 +0200
Subject: zsh: set LS_COLORS, remove ,, alias

---
 zsh/.zprofile | 7 ++++++-
 zsh/.zshrc    | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/zsh/.zprofile b/zsh/.zprofile
index c8d73c3..d224f58 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -33,4 +33,9 @@ export GTK_IM_MODULE=xim
 
 export SUDO_PROMPT=$'\e[31mSUDO\e[m password for \e[34m%p\e[m: '
 
-[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx "$HOME/.config/X11/xinitrc"
+# LS_COLORS is now required for `ls` to use colour
+eval "$(dircolors -b ~/.config/dircolors)"
+
+if [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]]; then
+	exec startx "$HOME/.config/X11/xinitrc"
+fi
diff --git a/zsh/.zshrc b/zsh/.zshrc
index ed0679e..f34714e 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -65,7 +65,6 @@ alias df='df -h'
 alias nano='nano -w' # No linewrap
 alias ncmpcpp='ncmpcpp -c ~/.config/ncmpcpp/config'
 alias 'cd..'='cd ..'
-alias ',,'='..'
 alias '...'='../..'
 alias mkdir='mkdir -vp'
 alias 'please?'='sudo $(history | tail -n1 | cut -c 8-)'
-- 
cgit v1.2.3-54-g00ecf