summaryrefslogtreecommitdiff
path: root/etc/env
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2009-03-28 10:14:44 +0100
committerDaniel Friesel <derf@derf.homelinux.org>2009-03-28 10:14:44 +0100
commit8fbd72a1f8ed2f6d5034e7a469291995dfe1f7c1 (patch)
treee50fa76216dd841aafd236e2684e598a6d37b9a7 /etc/env
parent7c183bd88672fa97083b5acb3ca3f8e0ed808822 (diff)
env: Allow local settings to override global ones
Diffstat (limited to 'etc/env')
-rw-r--r--etc/env6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/env b/etc/env
index 6f3dba6..6b47e46 100644
--- a/etc/env
+++ b/etc/env
@@ -7,9 +7,6 @@ fpath=($ZDIR/functions $ZDIR/completions $fpath)
# Additional zshenv settings from pkg
[[ -r $ZDIR/../provided/env ]] && source $ZDIR/../provided/env
-# local settings, not tracked with git
-[[ -r $ZDIR/local-env ]] && source $ZDIR/local-env
-
export EDITOR==vim
export MPD_HOST=saviour
export CALENDAR_DIR=$HOME/stuff
@@ -23,3 +20,6 @@ if [[ -x /usr/bin/lesspipe ]] {
export LESSOPEN='| /usr/bin/lesspipe %s'
export LESSCLOSE='/usr/bin/lesspipe %s %s'
}
+
+# local settings, not tracked with git
+[[ -r $ZDIR/local-env ]] && source $ZDIR/local-env