From e4660141e67e115765aeab2d428c5d2d64a7774f Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Wed, 31 May 2017 12:19:30 -0700
Subject: [PATCH] BUG: Stop duplicating $PATH

---
 tmux.conf    |  3 +++
 zsh/zprofile |  6 ++----
 zsh/zshenv   | 15 +++++++++++++++
 zsh/zshrc    | 18 ------------------
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/tmux.conf b/tmux.conf
index 2b51161..f0f571c 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,3 +1,6 @@
+# Ensure tmux doesn't launch a login shell
+set -g default-command /usr/local/bin/zsh
+
 # Automatic window title
 setw -g automatic-rename
 
diff --git a/zsh/zprofile b/zsh/zprofile
index bdcd884..1300610 100644
--- a/zsh/zprofile
+++ b/zsh/zprofile
@@ -1,4 +1,2 @@
-#
-# Executes commands at login pre-zshrc.
-#
-
+# Matthew Dillon
+# matthewrdillon@gmail.com
diff --git a/zsh/zshenv b/zsh/zshenv
index 19fee6e..0997dee 100644
--- a/zsh/zshenv
+++ b/zsh/zshenv
@@ -43,6 +43,21 @@ path=(
   $path
 )
 
+# set up local bin dirs
+export PATH="$PATH:$HOME/bin:$HOME/.bin"
+
+# shortcuts to projects
+export CDPATH="$CDPATH:$HOME/caporaso/qiime2"
+export CDPATH="$CDPATH:$HOME/projects"
+
+# set up golang
+export GOPATH="/Users/matthew/go"
+export PATH="$PATH:$GOPATH/bin"
+export CDPATH="$CDPATH:$GOPATH/src/github.com:$GOPATH/src/code.google.com/p:$GOPATH/src/bitbucket.org"
+
+# set miniconda3 bin dir last
+export PATH="$PATH:$HOME/miniconda3/bin"
+
 #
 # Less
 #
diff --git a/zsh/zshrc b/zsh/zshrc
index f79a150..5a0ae04 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -6,13 +6,6 @@ if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
   source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
 fi
 
-# set up local bin dirs
-export PATH="$PATH:$HOME/bin:$HOME/.bin"
-
-# shortcuts to projects
-export CDPATH="$CDPATH:$HOME/caporaso/qiime2"
-export CDPATH="$CDPATH:$HOME/projects"
-
 # shortcuts
 alias mailserver="sudo python -m smtpd -n -c DebuggingServer localhost:25"
 alias mongod="mongod --config /usr/local/etc/mongod.conf"
@@ -22,21 +15,10 @@ alias devenv="deactivate"
 alias q="source activate q2dev"
 alias i="ipython3"
 
-# set up golang
-export GOPATH="/Users/matthew/go"
-export PATH="$PATH:$GOPATH/bin"
-export CDPATH="$CDPATH:$GOPATH/src/github.com:$GOPATH/src/code.google.com/p:$GOPATH/src/bitbucket.org"
-
-# set miniconda3 bin dir last
-export PATH="$PATH:$HOME/miniconda3/bin"
-
 BASE16_SHELL=$HOME/.config/base16-shell/
 [ -n "$PS1" ] && [ -s $BASE16_SHELL/profile_helper.sh ] && eval "$($BASE16_SHELL/profile_helper.sh)"
 
 alias tmux="TERM=xterm-256color tmux"
 
-# set up local bin dir
-export PATH="$PATH:$HOME/bin"
-
 # Backup shortcuts
 alias back_things_up="rsync_tmbackup.sh $HOME /Volumes/field_on_fire/$HOST $HOME/.dotfiles/rsync_excludes.txt"