adjust path entries

[zsh.git] / .zsh / zshenv

diff --git a/.zsh/zshenv b/.zsh/zshenv
index 1948da5..5d22514 100644 (file)
--- a/.zsh/zshenv
+++ b/.zsh/zshenv
@@ -16,8 +16,11 @@ HOST=$HOST:r:r
 HOST=${HOST:-$(hostname -s)}
 DOMAIN=${DOMAIN:-$(hostname -d 2>&-)}
 [ "$DOMAIN" = "" -o "$DOMAIN" = "localdomain" -o "$DOMAIN" = "(none)" ] && DOMAIN=$(grep "^search " /etc/resolv.conf | cut -d' ' -f2)
+[[ -f /etc/debian_version ]] && DISTRI="Debian"
 
-[ -f /etc/debian_version ] && DISTRI="Debian"
+# Local settings and styles can go here and (usually) overwrite
+# things defined by me later.
+[[ -f ${ZDOTDIR}/zshenv.local ]] && source ${ZDOTDIR}/zshenv.local
 
 DEBUG=${DEBUG:-no}
 
@@ -25,18 +28,17 @@ DEBUG=${DEBUG:-no}
 fpath=( $HOME/.zsh/functions $HOME/zsh "$fpath[@]" )
 # Only unique entries please.
 typeset -U fpath
+fpath=( ${^fpath}(N-/) )
 export fpath
 
 # Include function path in script path so that we can run them even
 # though a subshell may not know about functions.
 # PATH should already be exported, but in case not. . .
 path=(
-    lala
-    "$HOME/bin"
+    "$lpath[@]"
     /usr/local/bin
     /bin
     /usr/bin
-    /srv/qa.debian.org/mia
     /usr/X11/bin
     /usr/bin/X11
     /usr/local/X11/bin
@@ -56,13 +58,21 @@ if [ "`id -u`" = "0" ] || ! [ -x /usr/bin/id ]; then
     )
 fi
 
+manpath=(
+    "$lmanpath[@]"
+    /usr/share/man
+    /usr/local/share/man
+    "$manpath[@]"
+)
+
 # Only unique entries please.
-typeset -U path
+typeset -gU path
+typeset -gU manpath
+
 # Remove entries that don't exist on this system.  Just for sanity's
 # sake more than anything.
 path=( ${^path}(N-/) )
-
-export PATH USER HOST DOMAIN UID
+manpath=( ${^manpath}(N-/) )
 
 # Command to use when redirecting from/to a null command.
 # READNULLCMD is redefined in .zshrc for interactive shells.
@@ -74,3 +84,5 @@ if [[ ${+ORIGGID} -eq 0 ]]; then
     export ORIGGID="$GID"
 fi
 
+# Just to make damn sure they are there.
+export PATH USER HOST DOMAIN UID OSNAME DISTRI