update submodules, remove bsd shims, fix bugs

[dotfiles.git] / base / .zshenv

diff --git a/base/.zshenv b/base/.zshenv
index 09faa1d343fc9361262c096f79285508b69409cb..e1debfdb108a32b6028ce85b488c596b49eeefe0 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,17 +1,28 @@
-if [ -f ~/.zshenv.local ]; then
-       source ~/.zshenv.local
-fi
+### path
+# /usr/{pkg,local,games} are unix/bsdisms
+typeset -U path
+path=({~/,/,/usr/}sbin {~/,/,/usr/}bin /usr/pkg/{s,}bin /usr/X11R{7,6}/bin
+      /usr/local/{s,}bin /usr/games $path)
 
+### posix
 export EDITOR=vim
+export PAGER=less
+export GREP_OPTIONS=--color=auto
+export LANG="en_US.UTF-8"
+export LC_CTYPE="$LANG"
+
+### xdg
 export XDG_CONFIG_HOME=~/etc
-export XDG_CONFIG_DIRS=~/.config:/etc/xdg
+export XDG_CONFIG_DIRS=~/.config:/usr/pkg/etc/xdg:/usr/local/etc/xdg:/etc/xdg
 export XDG_DATA_HOME=~/share
-export XDG_DATA_DIRS=~/.local/share:/usr/local/share/:/usr/share/
+export XDG_DATA_DIRS=~/.local/share:/usr/pkg/share:/usr/local/share:/usr/share
 export XDG_CACHE_HOME=~/tmp
+export XDG_RUNTIME_DIR=~/tmp
 
-export DVTM_TERM=rxvt-unicode
-export CLICOLOR=
-export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
-export GREP_OPTIONS=--color=auto
-
+### applications
 export PYTHONSTARTUP=~/.pythonrc
+
+### load site-specific
+if [[ -f ~/.zshenv.local ]] {
+       source ~/.zshenv.local
+}