Simplify configuration setup.

[config/dotfiles.git] / zsh / env

diff --git a/zsh/env b/zsh/env
index a3cb729747263e3380c6dc0fce4deac6ed8da7da..be6c5283bec63ebcb311ab8029d86759ad35491f 100644 (file)
--- a/zsh/env
+++ b/zsh/env
@@ -1,27 +1,19 @@
 # Zsh configuration file for environment related options.
 
 
-# Get the current hostname (first part before a dot).
-host=${$(hostname)//.*/}
-
-# Load environmental related settings used by all shells.
-# If the default file exists, load it.
-if [[ -f ~/.shell/env ]]; then
-    source ~/.shell/env
-fi
-# If an env file for the current hostname (first part before a dot) exists load
-# it, otherwise load env.local if available.
-if [[ -f ~/.shell/env.$host ]]; then
-    source ~/.shell/env.$host
-elif [[ -f ~/.shell/env.local ]]; then
-    source ~/.shell/env.local
-fi
-
-
-# If an env file for the current hostname (first part before a dot) exists load
-# it, otherwise load env.local if available.
-if [[ -f ~/.zsh/env.$host ]]; then;
-    source ~/.zsh/env.$host
-elif [[ -f ~/.zsh/env.local ]]; then;
-    source ~/.zsh/env.local
-fi
+. ~/.shell/functions
+
+source_debug ". ~/.zsh/env"
+
+source_config ~/.shell/env
+
+
+# Make sure elements in PATH are unique.
+typeset -U path PATH
+
+
+source_config ~/.zsh/env.local
+
+source_debug ". ~/.zsh/env (done)"
+
+# vim: ft=zsh