Simplify configuration setup.

[config/dotfiles.git] / zsh / env

diff --git a/zsh/env b/zsh/env
index ecfd002319ea3c815255ea3669b8692829acf1d3..be6c5283bec63ebcb311ab8029d86759ad35491f 100644 (file)
--- a/zsh/env
+++ b/zsh/env
@@ -1,33 +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 [[ -f ~/.shell/env ]]; then
-    . ~/.shell/env
-# Fallback functions as ~/.shell/env couldn't be loaded.
-else
-    function source_debug() {
-        echo $@
-    }
-    function source_config() {
-        echo "Couldn't load source_config(), can't source files." >&2
-    }
-fi
-
-source_debug "sourcing ~/.zsh/env"
-
-# Load global env file for current hostname (first part before a dot) or
-# global env.local.
-source_config ~/.shell "" env $host
-
-# Load rc file for current OS.
-source_config ~/.zsh os env $(uname) nolocal
-# Load env file for current hostname (first part before a dot) or env.local.
-source_config ~/.zsh host env $host
-
-source_debug "finished sourcing ~/.zsh/env"
+. ~/.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