3 files changed, 9 insertions, 1 deletions
diff --git a/.xinitrc b/.xinitrc
index 9bc450b..8cc9f49 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -15,4 +15,8 @@ urxvtd -q -f -o &
 urxvtc &
 # /home/ryan/.screenlayout/work.sh
 /home/ryan/.screenlayout/SCREENLAYOUT.sh && nitrogen --restore
+if [[ "PULSE_JACKD" = "True" ]]; then
+   start-pulseaudio-x11 &
+   jackd -d alsa &
+fi
 exec /usr/bin/xmonad
diff --git a/Makefile b/Makefile
index 67c97c1..5ea6cce 100755
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ VARS_.muttrc            = MSMTP_PATH
 VARS_.netrc             = LOCAL_PASS GMAIL_PASS
 VARS_.offlineimaprc     = LOCAL_PASS GMAIL_PASS QUEENSU_PASS MCGSOCS_PASS MCGILL_PASS
 VARS_.screenrc          = ZSH_PATH SCREEN_HOST_COLOUR
-VARS_.xinitrc           = SCREENLAYOUT REDSHIFT_MODE GSD_PATH
+VARS_.xinitrc           = SCREENLAYOUT REDSHIFT_MODE GSD_PATH PULSE_JACKD
 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 KEYCHAIN
diff --git a/SUBSTS b/SUBSTS
index ef590b0..55040c9 100644
--- a/SUBSTS
+++ b/SUBSTS
@@ -77,3 +77,7 @@ GPG_BINARY gpg2
 # /usr/local/bin/pgpewrap on OpenBSD
 # /usr/lib/mutt/pgpewrap on Debian
 PGPEWRAP_BINARY /usr/lib/mutt/pgpewrap
+
+# Start pulse and jackd?
+# Set to True to enable, anything else otherwise
+PULSE_JACKD True