X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Fenv;h=ade0f315102b3b347c0d93b65370385e2be7e4e5;hb=dc5e55f9968b8dfdd5d7287732489091fbd11ee2;hp=801b2379e24327a75db295599210b221c9a2448e;hpb=7abc06281cf09194942f844e9655ad96d87c0bdd;p=config%2Fdotfiles.git

diff --git a/zsh/env b/zsh/env
index 801b237..ade0f31 100644
--- a/zsh/env
+++ b/zsh/env
@@ -1,21 +1,23 @@
 # Zsh configuration file for environment related options.
 
 
-# Use UTF-8 encoding in the terminal.
-export LC_ALL=en_US.UTF-8
-
-# Set Vim as my editor.
-export EDITOR=vim
+# Get the current hostname (first part before a dot).
+host=${$(hostname)//.*/}
 
-# Set less as my pager, its configuration is done through the .less file.
-export PAGER=less
+# Load environmental related settings used by all shells.
+if [[ -f ~/.shell/env ]]; then
+    source ~/.shell/env
+else
+    function source_config() {
+        echo "Couldn't load source_config(), can't source files." >&2
+    }
+fi
 
+# Load global env file for current hostname (first part before a dot) or
+# global env.local.
+source_config ~/.shell "" env $host
 
-# If an env.local file exists load it, otherwise load an env file for the
-# current hostname (first part before a dot) if it exists.
-host=${$(hostname)//.*/}
-if [[ -f ~/.zsh/env.local ]]; then;
-    source ~/.zsh/env.local
-elif [[ -f ~/.zsh/env.$host ]]; then;
-    source ~/.zsh/env.$host
-fi
+# 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