From cfdf23d93c03e42ed823a32f84e70ff5004ec489 Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Tue, 17 Nov 2015 00:26:42 -0500
Subject: [PATCH] Move zsh exports to zshenv

---
 zshenv | 32 ++++++++++++++++++++++++++++++++
 zshrc  | 36 ------------------------------------
 2 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/zshenv b/zshenv
index 76e4b02..158c58a 100644
--- a/zshenv
+++ b/zshenv
@@ -1,2 +1,34 @@
 fpath=($fpath $HOME/.zsh/func)
 typeset -U fpath
+
+# Unbreak broken, non-colored terminal
+export TERM=xterm-256color
+
+# Use vim as the editor
+export EDITOR=vim
+
+# Grep tweaks
+export GREP_OPTIONS="-nRi --color --exclude-dir=.git  --exclude-dir=tmp --exclude-dir=log --exclude-dir=node_modules --exclude-dir=bower_components --exclude-dir=coverage --exclude-dir=.bundle --exclude=*.csv --exclude=*.pdf --exclude-dir=vendor --exclude-dir=rdoc --exclude-dir=target --exclude-dir=personal" # --exclude-dir=images --exclude-dir=coverage
+
+export RBENV_PATH="$HOME/.rbenv"
+
+export RUBY_HEAP_MIN_SLOTS=1000000 # for < 2.1.1, will raise warning when using 2.1.1
+export RUBY_GC_HEAP_INIT_SLOTS=1000000 # for 2.1.1
+export RUBY_HEAP_SLOTS_INCREMENT=1000000
+export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
+export RUBY_GC_MALLOC_LIMIT=1000000000
+export RUBY_HEAP_FREE_MIN=500000
+
+# Setup Ansible
+ANSIBLE_DIR=$HOME/.personal-files/open-source/ansible
+export PYTHONPATH=${ANSIBLE_DIR}/lib:${PYTHONPATH}
+export ANSIBLE_LIBRARY=${ANSIBLE_DIR}/library
+export ANSIBLE_HOSTS=~/.ansible_hosts
+export LEIN_FAST_TRAMPOLINE=y
+export ANDROID_HOME=/usr/local/opt/android-sdk
+
+#export PATH=/usr/local/sbin:/usr/local/bin:${PATH}
+path=($HOME/bin ${ANSIBLE_DIR}/bin ${RBENV_PATH}/bin $path)
+
+# Start rbenv
+eval "$(rbenv init -)"
diff --git a/zshrc b/zshrc
index 0f29eec..af2a90c 100644
--- a/zshrc
+++ b/zshrc
@@ -30,15 +30,6 @@ chpwd() {
   fi
 }
 
-# Unbreak broken, non-colored terminal
-export TERM=xterm-256color
-
-# Use vim as the editor
-export EDITOR=vim
-
-# Grep tweaks
-export GREP_OPTIONS="-nRi --color --exclude-dir=.git  --exclude-dir=tmp --exclude-dir=log --exclude-dir=node_modules --exclude-dir=bower_components --exclude-dir=coverage --exclude-dir=.bundle --exclude=*.csv --exclude=*.pdf --exclude-dir=vendor --exclude-dir=rdoc --exclude-dir=target --exclude-dir=personal" # --exclude-dir=images --exclude-dir=coverage
-
 # Save a ton of history
 export HISTSIZE=20000
 export HISTFILE="$HOME/.history"
@@ -67,30 +58,3 @@ source $ZSH/lib/*.zsh
 # Source my custom files after oh-my-zsh so I can override things.
 source $HOME/.dotfiles/zsh/aliases
 source $HOME/.dotfiles/zsh/functions
-
-# Customize to your needs...
-export PATH=/usr/local/sbin:/usr/local/bin:${PATH}
-PATH=$PATH:$HOME/bin
-
-# Start rbenv
-export RBENV_PATH="$HOME/.rbenv"
-export PATH="$RBENV_PATH/bin:$PATH"
-eval "$(rbenv init -)"
-
-export RUBY_HEAP_MIN_SLOTS=1000000 # for < 2.1.1, will raise warning when using 2.1.1
-export RUBY_GC_HEAP_INIT_SLOTS=1000000 # for 2.1.1
-
-export RUBY_HEAP_SLOTS_INCREMENT=1000000
-export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
-export RUBY_GC_MALLOC_LIMIT=1000000000
-export RUBY_HEAP_FREE_MIN=500000
-
-# Setup Ansible
-ANSIBLE_DIR=/Users/pulsar/jelly/oss/python/ansible
-export PATH=${ANSIBLE_DIR}/bin:${PATH}
-export PYTHONPATH=${ANSIBLE_DIR}/lib:${PYTHONPATH}
-export ANSIBLE_LIBRARY=${ANSIBLE_DIR}/library
-export MANPATH=${ANSIBLE_DIR}/docs/man:${MANPATH}
-export ANSIBLE_HOSTS=~/.ansible_hosts
-export LEIN_FAST_TRAMPOLINE=y
-export ANDROID_HOME=/usr/local/opt/android-sdk