From 0530d4ee7625c00fea05ae604c7adb4357c426a4 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Tue, 5 Sep 2017 11:28:15 -0400
Subject: [PATCH] Move variables and tmpdir stuff to .zshenv and source from
 .profile

---
 .profile | 27 +--------------------------
 .zshenv  | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 .zshenv

diff --git a/.profile b/.profile
index fd965fd..637612f 100644
--- a/.profile
+++ b/.profile
@@ -1,31 +1,6 @@
 #-*- mode: sh; -*-
-# Environment variables
-export ARDUINO_DIR="/usr/share/arduino"
-export ARDMK_DIR="$HOME/Programs/Arduino-Makefile"
-export STEAMAPPS="$HOME/.local/share/Steam/steamapps/common"
-export QT_STYLE_OVERRIDE=gtk2
-export ALTERNATE_EDITOR=""
-export TERMINAL=roxterm
-export CALIBRE_USE_SYSTEM_THEME=true
 
-export WORDCHARS=${WORDCHARS/\//}
-export PAGER=less
-
-# Add $HOME/.bin to PATH if it exists
-if [[ -d "$HOME/.bin" ]]; then
-  export PATH="$PATH:$HOME/.bin"
-fi
-
-# Set temporary files locations
-if [[ ! -d "$TMPDIR" ]]; then
-  export TMPDIR="/tmp/$LOGNAME"
-  mkdir -p -m 700 "$TMPDIR"
-fi
-
-TMPPREFIX="${TMPDIR%/}/zsh"
-if [[ ! -d "$TMPPREFIX" ]]; then
-  mkdir -p "$TMPPREFIX"
-fi
+source $HOME/.zshenv
 
 # Gnupg setup
 ## Start the gpg-agent if not already running
diff --git a/.zshenv b/.zshenv
new file mode 100644
index 0000000..e8df6c7
--- /dev/null
+++ b/.zshenv
@@ -0,0 +1,32 @@
+#-*- mode: sh; -*-
+
+# Environment variables
+export ARDUINO_DIR="/usr/share/arduino"
+export ARDMK_DIR="$HOME/Programs/Arduino-Makefile"
+export STEAMAPPS="$HOME/.local/share/Steam/steamapps/common"
+export QT_STYLE_OVERRIDE=gtk2
+export ALTERNATE_EDITOR=""
+export TERMINAL=roxterm
+export CALIBRE_USE_SYSTEM_THEME=true
+
+export WORDCHARS=${WORDCHARS/\//}
+export PAGER=less
+
+# Add $HOME/.bin to PATH if it exists and is not already in the path
+if [[ -d "$HOME/.bin" ]] && ! grep -q ":$HOME"'/\.bin\(:\|$\)' <<< "$PATH"
+then
+  export PATH="$PATH:$HOME/.bin"
+fi
+
+# Set temporary files locations
+if [[ ! -d "$TMPDIR" ]]
+then
+  export TMPDIR="/tmp/$LOGNAME"
+  mkdir -p -m 700 "$TMPDIR"
+fi
+
+TMPPREFIX="${TMPDIR%/}/zsh"
+if [[ ! -d "$TMPPREFIX" ]]
+then
+  mkdir -p "$TMPPREFIX"
+fi