summaryrefslogtreecommitdiff
path: root/.zsh/zshrc
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2011-08-24 00:31:03 +0200
committerTobias Klauser <tklauser@distanz.ch>2011-08-24 00:31:03 +0200
commitcdf2dc0e63270120a3ac6f4defb5cc19c961b773 (patch)
tree8d7c35b7a67b821c4c8725242efd5855b3ae7d45 /.zsh/zshrc
parent455e0cb4c3bb9bdff481c4fce72ebc1b4114dbdd (diff)
Tweaks to make zsh config run on Mac OS X without GNU coreutils
Diffstat (limited to '.zsh/zshrc')
-rw-r--r--.zsh/zshrc/00_colours2
-rw-r--r--.zsh/zshrc/30_aliases4
2 files changed, 3 insertions, 3 deletions
diff --git a/.zsh/zshrc/00_colours b/.zsh/zshrc/00_colours
index ad3847e..4f00519 100644
--- a/.zsh/zshrc/00_colours
+++ b/.zsh/zshrc/00_colours
@@ -28,7 +28,7 @@ else
fi
# colour setup for ls
-eval $(dircolors -b)
+is_darwin || eval $(dircolors -b)
# colour setup for ls on OS X:
is_darwin && export CLICOLOR=1
diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index dc151b1..369b479 100644
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -22,8 +22,8 @@ alias m='mount'
alias u='umount'
# enable color support of ls
-if [ "${TERM}" != "dumb" ]; then
- alias ls='ls --color=auto'
+if [ "${TERM}" != "dumb" ] ; then
+ is_darwin || alias ls='ls --color=auto'
fi
# use colors when browsing man pages, but only if not using LESS_TERMCAP_*