From d93e7bc530fdf1abbc7704f22effd00b99700d5b Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 4 Jul 2019 15:11:45 -0500
Subject: [PATCH] Revert "i3, xinitrc: Move some programs to .xinitrc"

This reverts commit 952ea6fb1d1ed72df5a74f2b03cecfd20411d4a2.
---
 .config/i3/config | 14 ++++++++++++--
 .xinitrc          | 22 ----------------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/.config/i3/config b/.config/i3/config
index ff6d58ce..6683a2d1 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -7,9 +7,19 @@
 ## Startup tasks
 ###################
 
-# These two tasks remain i3's responsibility as executing them here ensures
-# that the WM is up and running before they start
+# High-priority shit
+exec --no-startup-id pulseaudio
+exec --no-startup-id mate-settings-daemon
+exec --no-startup-id compton
+exec --no-startup-id nitrogen --restore
 exec --no-startup-id ~/.config/polybar/launch.sh
+exec --no-startup-id redshift
+# Start up whenever shit
+exec --no-startup-id dunst
+exec --no-startup-id /usr/lib/x86_64-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1
+exec --no-startup-id /usr/lib/polkit-mate/polkit-mate-authentication-agent-1
+exec --no-startup-id mate-power-manager
+# XDG
 exec --no-startup-id "dex -a"
 
 ###################
diff --git a/.xinitrc b/.xinitrc
index 7ccf93f1..f219c05e 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,29 +1,7 @@
 #!/bin/sh
-
-# Source in xsessionrc
 if [ -z "$XSESSION_HAS_SOURCED" ]; then
 	source ~/.xsessionrc
 fi
 
 unset XDG_CURRENT_DESKTOP
-unset XSESSION_HAS_SOURCED
-
-# Basic setup
-xset -b -dpms
-
-# High-priority shit
-pulseaudio &
-mate-settings-daemon &
-compton &
-nitrogen --restore &
-~/.config/polybar/launch.sh &
-redshift &
-
-# Start up whenever shit
-dunst &
-/usr/lib/x86_64-linux-gnu/polkit-mate/polkit-mate-authentication-agent-1 &
-/usr/lib/polkit-mate/polkit-mate-authentication-agent-1 &
-mate-power-manager &
-
-# Off to the races
 exec i3