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

[config/dotfiles.git] / zsh / env

diff --git a/zsh/env b/zsh/env
index 269695ee035d2be5bf73668598109e51ba9b4419..37b146769c69772288a6da2c217affb2dad88eef 100644 (file)
--- a/zsh/env
+++ b/zsh/env
@@ -7,20 +7,15 @@ export LC_ALL=en_US.UTF-8
 # Set Vim as my editor.
 export EDITOR=vim
 
-# Set less as my pager.
+# Set less as my pager, its configuration is done through the .less file.
 export PAGER=less
 
-# Set options for less. If the command output fits on the current terminal
-# page less automatically quits. Also allows the use with colordiff.
-export LESS="--no-init --search-skip-screen --quit-if-one-screen \
---RAW-CONTROL-CHARS"
 
-
-# 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