From 2b91596b4c88345ef0639eef5b88a8dca9d514b3 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Tue, 26 Aug 2008 21:22:34 +0200
Subject: Moved ZDIR and fpath to zshenv

---
 .links            | 1 +
 etc/env           | 9 +++++++++
 etc/parameters    | 1 -
 etc/rc            | 1 -
 hooks/post-update | 3 ++-
 5 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 etc/env

diff --git a/.links b/.links
index 6e4b5d9..5882588 100644
--- a/.links
+++ b/.links
@@ -1,2 +1,3 @@
 soft .zshrc packages/zsh/etc/rc
 soft .zprofile packages/zsh/etc/profile
+soft .zshenv packages/zsh/etc/env
diff --git a/etc/env b/etc/env
new file mode 100644
index 0000000..86b2411
--- /dev/null
+++ b/etc/env
@@ -0,0 +1,9 @@
+## vim:ft=zsh
+## zshenv
+## Daniel Friesel <derf@derf.homelinux.org>
+## https://derf.homelinux.org/~derf/dotfiles/zsh/env
+## see also: https://derf.homelinux.org/~derf/dotfiles/zsh/
+
+ZDIR=$HOME/packages/zsh/etc
+fpath=($ZDIR/functions $ZDIR/completions $fpath)
+[[ -r $ZDIR/../provided/env ]] && source $ZDIR/../provided/env
diff --git a/etc/parameters b/etc/parameters
index 2bd152a..e454982 100644
--- a/etc/parameters
+++ b/etc/parameters
@@ -9,7 +9,6 @@ LISTMAX=0
 TIMEFMT='%E real  %U user  %S system  %P %J'
 
 # Paths
-fpath=($ZDIR/functions $ZDIR/completions $fpath)
 [[ $path[1] = $HOME/bin ]] || export PATH=$HOME/bin:$PATH
 linux: [[ -z $MANPATH ]] && export MANPATH=$(manpath):$HOME/packages/.collected/man
 
diff --git a/etc/rc b/etc/rc
index 3fea4ac..30ba9fa 100644
--- a/etc/rc
+++ b/etc/rc
@@ -5,7 +5,6 @@
 ## see also: https://derf.homelinux.org/~derf/dotfiles/zsh/
 
 ## mostly internal stuff
-ZDIR=$HOME/packages/zsh/etc
 uname=$(uname)
 alias 'linux:'='[[ $uname = Linux ]] &&'
 alias 'non-linux:'='[[ $uname = Linux ]] ||'
diff --git a/hooks/post-update b/hooks/post-update
index fad04b1..8fb46e2 100644
--- a/hooks/post-update
+++ b/hooks/post-update
@@ -3,13 +3,14 @@ mkdir -p $HOME/var/cache/zsh
 mkdir -p $PDIR/zsh/provided
 rm -f $HOME/var/cache/zsh/compdump
 echo -n > $PDIR/zsh/provided/includes
+echo -n > $PDIR/zsh/provided/env
 
 typeset -a futurepath
 for inc in $PDIR/*/provides/zsh/{functions,completions}(N); {
 	futurepath+=$inc
 }
 if [[ -n $futurepath ]] {
-	echo "fpath=($futurepath" '$fpath)' >> $PDIR/zsh/provided/includes
+	echo "fpath=($futurepath" '$fpath)' > $PDIR/zsh/provided/env
 }
 for inc in $PDIR/*/provides/zsh/functions(N); {
 	echo "autoload ${inc:t}" >> $PDIR/zsh/provided/includes
-- 
cgit v1.2.3