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

diff --git a/zsh/env b/zsh/env
index 801b237..a3cb729 100644
--- a/zsh/env
+++ b/zsh/env
@@ -1,21 +1,27 @@
 # 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 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.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;
+# 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