From 7a4433e92c0d7d11f3d8db121c9ffb8f057be1b3 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Tue, 22 May 2012 13:07:33 -0400
Subject: [PATCH] [#171] Move environment variables into zshenv

---
 modules/environment/init.zsh | 66 ----------------------------------
 templates/zshenv             | 69 ++++++++++++++++++++++++++++++++++++
 templates/zshrc              |  3 --
 3 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/modules/environment/init.zsh b/modules/environment/init.zsh
index 7460e727..92acd315 100644
--- a/modules/environment/init.zsh
+++ b/modules/environment/init.zsh
@@ -22,78 +22,12 @@ unsetopt BG_NICE          # Don't run all background jobs at a lower priority.
 unsetopt HUP              # Don't kill jobs on shell exit.
 unsetopt CHECK_JOBS       # Don't report on jobs when shell exit.
 
-# Paths
-typeset -gU cdpath fpath mailpath manpath path
-typeset -gUT INFOPATH infopath
-
-cdpath=(
-  $HOME
-  $cdpath
-)
-
-infopath=(
-  /usr/local/share/info
-  /usr/share/info
-  $infopath
-)
-
-manpath=(
-  /usr/local/share/man
-  /usr/share/man
-  $manpath
-)
-
-for path_file in /etc/manpaths.d/*(.N); do
-  manpath+=($(<$path_file))
-done
-unset path_file
-
-path=(
-  /usr/local/{bin,sbin}
-  /usr/{bin,sbin}
-  /{bin,sbin}
-  $path
-)
-
-for path_file in /etc/paths.d/*(.N); do
-  path+=($(<$path_file))
-done
-unset path_file
-
-# Language
-if [[ -z "$LANG" ]]; then
-  eval "$(locale)"
-fi
-
-# Editors
-export EDITOR="vim"
-export VISUAL="vim"
-export PAGER='less'
-
 # Grep
 if zstyle -t ':omz:environment:grep' color; then
   export GREP_COLOR='37;45'
   export GREP_OPTIONS='--color=auto'
 fi
 
-# Browser (Default)
-if [[ "$OSTYPE" == darwin* ]]; then
-  export BROWSER='open'
-fi
-
-# Less
-export LESSCHARSET="UTF-8"
-export LESSHISTFILE='-'
-export LESSEDIT='vim ?lm+%lm. %f'
-
-# Mouse-wheel scrolling has been disabled by -X (disable screen clearing).
-# Remove -X and -F (exit if the content fits on one screen) to enable it.
-export LESS='-F -g -i -M -R -S -w -X -z-4'
-
-if (( $+commands[lesspipe.sh] )); then
-  export LESSOPEN='| /usr/bin/env lesspipe.sh %s 2>&-'
-fi
-
 # Termcap
 if zstyle -t ':omz:environment:termcap' color; then
   export LESS_TERMCAP_mb=$'\E[01;31m'      # begin blinking
diff --git a/templates/zshenv b/templates/zshenv
index 89f92755..de7ebe8d 100644
--- a/templates/zshenv
+++ b/templates/zshenv
@@ -5,3 +5,72 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
+# Set the path to Oh My Zsh.
+export OMZ="$HOME/.oh-my-zsh"
+
+# Paths
+typeset -gU cdpath fpath mailpath manpath path
+typeset -gUT INFOPATH infopath
+
+cdpath=(
+  $HOME
+  $cdpath
+)
+
+infopath=(
+  /usr/local/share/info
+  /usr/share/info
+  $infopath
+)
+
+manpath=(
+  /usr/local/share/man
+  /usr/share/man
+  $manpath
+)
+
+for path_file in /etc/manpaths.d/*(.N); do
+  manpath+=($(<$path_file))
+done
+unset path_file
+
+path=(
+  /usr/local/{bin,sbin}
+  /usr/{bin,sbin}
+  /{bin,sbin}
+  $path
+)
+
+for path_file in /etc/paths.d/*(.N); do
+  path+=($(<$path_file))
+done
+unset path_file
+
+# Language
+if [[ -z "$LANG" ]]; then
+  eval "$(locale)"
+fi
+
+# Editors
+export EDITOR="vim"
+export VISUAL="vim"
+export PAGER='less'
+
+# Browser (Default)
+if [[ "$OSTYPE" == darwin* ]]; then
+  export BROWSER='open'
+fi
+
+# Less
+export LESSCHARSET="UTF-8"
+export LESSHISTFILE='-'
+export LESSEDIT='vim ?lm+%lm. %f'
+
+# Mouse-wheel scrolling has been disabled by -X (disable screen clearing).
+# Remove -X and -F (exit if the content fits on one screen) to enable it.
+export LESS='-F -g -i -M -R -S -w -X -z-4'
+
+if (( $+commands[lesspipe.sh] )); then
+  export LESSOPEN='| /usr/bin/env lesspipe.sh %s 2>&-'
+fi
+
diff --git a/templates/zshrc b/templates/zshrc
index 160a80ac..9305f90d 100644
--- a/templates/zshrc
+++ b/templates/zshrc
@@ -5,9 +5,6 @@
 #   Sorin Ionescu <sorin.ionescu@gmail.com>
 #
 
-# Set the path to Oh My Zsh.
-export OMZ="$HOME/.oh-my-zsh"
-
 # Set the key mapping style to 'emacs' or 'vi'.
 zstyle ':omz:module:editor' keymap 'emacs'