aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Singleton <matt@xcolour.net>2011-12-19 03:23:22 -0500
committerMatt Singleton <matt@xcolour.net>2011-12-19 03:23:22 -0500
commitf5b1d17f62fc8f9e161eaed516b0f44d729f6a12 (patch)
treeb50bce5dd43da60367e8f3bfd113373d5b53a828
parentb302e22689fc5a9fa05b40386a06b08ae52eb21b (diff)
actually use the dircolors conf file
-rwxr-xr-xdeploy.sh2
-rw-r--r--zsh/appearance.zsh4
2 files changed, 3 insertions, 3 deletions
diff --git a/deploy.sh b/deploy.sh
index dc2fc33..f26d69e 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -6,7 +6,7 @@ rm -rf dotfiles-backup
mkdir -p dotfiles-backup
# deploy
-for f in vimrc gvimrc gitconfig gitignore zshrc zsh vim
+for f in vimrc gvimrc gitconfig gitignore zshrc zsh vim dircolors.conf
do
if [ -e ~/.${f} ]; then
mv ~/.${f} dotfiles-backup/${f}
diff --git a/zsh/appearance.zsh b/zsh/appearance.zsh
index de0232b..c1c18a3 100644
--- a/zsh/appearance.zsh
+++ b/zsh/appearance.zsh
@@ -5,12 +5,12 @@
if [ -e /usr/local/bin/gls ]; then
# if GNU ls is installed (e.g. on BSD), use it
alias ls='/usr/local/bin/gls --color=tty'
- export LS_COLORS="rs=0:di=34:ln=36:pi=40;33:so=35:do=35:bd=40;33:cd=40;33:or=40;31:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=32"
+ eval `gdircolors ~/.dircolors.conf`
else
# otherwise, detect which version of ls is on the path
if $(ls --color -d . &>/dev/null 2>&1); then
alias ls='ls --color=tty'
- export LS_COLORS="rs=0:di=34:ln=36:pi=40;33:so=35:do=35:bd=40;33:cd=40;33:or=40;31:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=32"
+ eval `gdircolors ~/.dircolors.conf`
else
alias ls='ls -G'
export LSCOLORS="exgxbxdxcxegedxbxgxcxd"