First load the zsh file for this hostname, then (env|rc).local.

diff --git a/zsh/env b/zsh/env
index 801b2379e24327a75db295599210b221c9a2448e..37b146769c69772288a6da2c217affb2dad88eef 100644 (file)
--- a/zsh/env
+++ b/zsh/env
@@ -11,11 +11,11 @@ export EDITOR=vim
 export PAGER=less
 
 
-# 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.
+# If an env file for the current hostname (first part before a dot) exists load
+# it, otherwise load env.local if available.
 host=${$(hostname)//.*/}
-if [[ -f ~/.zsh/env.local ]]; then;
-    source ~/.zsh/env.local
-elif [[ -f ~/.zsh/env.$host ]]; then;
+if [[ -f ~/.zsh/env.$host ]]; then;
     source ~/.zsh/env.$host
+elif [[ -f ~/.zsh/env.local ]]; then;
+    source ~/.zsh/env.local
 fi

diff --git a/zsh/rc b/zsh/rc
index 18ffa0ca062159a0a1235706df889816ecb53d46..5d20a458d5855f1cb2ade92d5d94c16358444a04 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -95,11 +95,11 @@ function ll() {
 }
 
 
-# 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.
+# If a rc file for the current hostname (first part before a dot) exists load
+# it, otherwise load rc.local if available.
 host=${$(hostname)//.*/}
-if [[ -f ~/.zsh/rc.local ]]; then;
-    source ~/.zsh/rc.local
-elif [[ -f ~/.zsh/rc.$host ]]; then;
+if [[ -f ~/.zsh/rc.$host ]]; then;
     source ~/.zsh/rc.$host
+elif [[ -f ~/.zsh/rc.local ]]; then;
+    source ~/.zsh/rc.local
 fi