3 files changed, 13 insertions, 8 deletions
diff --git a/.zshrc b/.zshrc
index 0dae9f6..03d6f93 100644
--- a/.zshrc
+++ b/.zshrc
@@ -773,10 +773,12 @@ NO_verbose		\
 
 # GPG / SSH AGENT
 
-keychain id_rsa
-keychain -Q ${GPGKEY} ${GPGKEY1}
-[ -z "$HOSTNAME" ] && HOSTNAME=`uname -n`
-[ -f $HOME/.keychain/$HOSTNAME-sh ] &&
-       . $HOME/.keychain/$HOSTNAME-sh
-[ -f $HOME/.keychain/$HOSTNAME-sh-gpg ] &&
-       . $HOME/.keychain/$HOSTNAME-sh-gpg
+if [[ "KEYCHAIN" = "True" ]]; then
+    keychain id_rsa
+    keychain -Q ${GPGKEY} ${GPGKEY1}
+    [ -z "$HOSTNAME" ] && HOSTNAME=`uname -n`
+    [ -f $HOME/.keychain/$HOSTNAME-sh ] &&
+           . $HOME/.keychain/$HOSTNAME-sh
+    [ -f $HOME/.keychain/$HOSTNAME-sh-gpg ] &&
+           . $HOME/.keychain/$HOSTNAME-sh-gpg
+fi
diff --git a/SUBSTS b/SUBSTS
index 90f46c5..616ba84 100644
--- a/SUBSTS
+++ b/SUBSTS
@@ -55,4 +55,7 @@ GREP_PATH /bin/grep
 # path to gnome-settings-daemon
 GSD_PATH /usr/local/libexec/gnome-settings-daemon
 
+# Enable keychain? If so, set to True
+KEYCHAIN True
+
 LOCALHOST epsilon.ryanak.ca
diff --git a/dm b/dm
index fbb931c..fe7b529 100755
--- a/dm
+++ b/dm
@@ -85,7 +85,7 @@ VARS_.screenrc          = ZSH_PATH SCREEN_HOST_COLOUR
 VARS_.xinitrc           = SCREENLAYOUT REDSHIFT_MODE GSD_PATH
 VARS_.xmonad/xmonad.hs  = XMONAD_DZEN_W XMONAD_DZEN_X XMONAD_DZEN_Y
 VARS_.zsh/func/prompt_wunjo_setup = ZSH_HOST_COLOUR
-VARS_.zshrc             = LOCALE SUBSTS_RM SUBSTS_LS MSMTP_PATH
+VARS_.zshrc             = LOCALE SUBSTS_RM SUBSTS_LS MSMTP_PATH KEYCHAIN
 VARS_bin/run-mailcheck  = ZSH_PATH GREP_PATH
 
 all: clean build