X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Fenv;h=be6c5283bec63ebcb311ab8029d86759ad35491f;hb=e22dba1101a1100a18007e6dd0bbde11c9681dfb;hp=cff3f197bff73de256b7d294a7484410c48c146a;hpb=550ad254d2999033615dfd261a7b9e6592e83f89;p=config%2Fdotfiles.git

diff --git a/zsh/env b/zsh/env
index cff3f19..be6c528 100644
--- a/zsh/env
+++ b/zsh/env
@@ -1,36 +1,19 @@
 # Zsh configuration file for environment related options.
 
 
-# Get the current hostname (first part before a dot).
-host=${$(hostname)//.*/}
+. ~/.shell/functions
 
-# 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 ". ~/.zsh/env"
 
-source_debug "sourcing ~/.zsh/env"
+source_config ~/.shell/env
 
 
 # Make sure elements in PATH are unique.
 typeset -U path PATH
 
 
-# Load global env file for current hostname (first part before a dot) or
-# global env.local.
-source_config ~/.shell "" env $host
+source_config ~/.zsh/env.local
 
-# 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"
+source_debug ". ~/.zsh/env (done)"
 
 # vim: ft=zsh