X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bash%2Frc;h=eb672889360374c13d7e2f8009690dd26dd84d9a;hb=15483177a0e457dfae6a44caed7392ca3762de5c;hp=e0563a93942dbe0d4b2ba15264874185c1508356;hpb=399ca7f02e14151377d47b97473fdba7c9b38e3b;p=config%2Fdotfiles.git

diff --git a/bash/rc b/bash/rc
index e0563a9..eb67288 100644
--- a/bash/rc
+++ b/bash/rc
@@ -1,20 +1,31 @@
 # Main bash configuration file.
 
 
-# Use UTF-8 encoding in the terminal.
-export LC_ALL=en_US.UTF-8
+# Get the current hostname (first part before a dot).
+host=$(echo $(hostname) | sed -e 's/\..*$//')
+
+# 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
+
 
-# Use Vim as editor.
-export EDITOR='vim'
 # Use Vi(m) style in bash.
 set -o vi
 
 
-# If a rc.local file exists load it, otherwise load a rc file for the current
-# hostname (first part before a dot) if it exists.
-host=$(echo $(hostname) | sed -e 's/\..*$//')
-if [ -f ~/.bash/rc.local ]; then
-    source ~/.bash/rc.local
-elif [ -f ~/.bash/rc.$host ]; then
+# If a rc file for the current hostname (first part before a dot) exists load
+# it, otherwise load rc.local if available.
+if [ -f ~/.bash/rc.$host ]; then
     source ~/.bash/rc.$host
+elif [ -f ~/.bash/rc.local ]; then
+    source ~/.bash/rc.local
 fi