From 82f3e0b2a87d637cdfd03446353150d8da52cede Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Fri, 3 Feb 2017 14:36:58 -0600
Subject: [PATCH] new x stuff

---
 env/x/link.bash |  2 ++
 env/x/xinitrc   | 30 ++++++++----------------------
 env/x/xprofile  | 24 ++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 env/x/xprofile

diff --git a/env/x/link.bash b/env/x/link.bash
index 55b9d94..24bb55e 100755
--- a/env/x/link.bash
+++ b/env/x/link.bash
@@ -11,11 +11,13 @@ rm -f "$HOME/.Xresources"
 rm -f "$HOME/.gtkrc-2.0"
 rm -f "$HOME/.config/gtk-3.0/settings.ini"
 rm -f "$HOME/.config/compton.conf"
+rm -f "$HOME/.xprofile"
 ln -s "$MODULE_PATH/xinitrc" "$HOME/.xinitrc"
 ln -s "$MODULE_PATH/xresources" "$HOME/.Xresources"
 ln -s "$MODULE_PATH/gtk3settings.ini" "$HOME/.config/gtk-3.0/settings.ini"
 ln -s "$MODULE_PATH/gtk2rc" "$HOME/.gtkrc-2.0"
 ln -s "$MODULE_PATH/compton.conf" "$HOME/.config/compton.conf"
+ln -s "$MODULE_PATH/xprofile" "$HOME/.xprofile"
 
 sudo mkdir -p /root/.gtk-3.0/
 sudo mkdir -p /root/.config/gtk-3.0/
diff --git a/env/x/xinitrc b/env/x/xinitrc
index db71527..625d9a1 100644
--- a/env/x/xinitrc
+++ b/env/x/xinitrc
@@ -1,36 +1,22 @@
 #!/bin/sh
 
-if [ -f ~/.fehbg ]; then
-  ~/.fehbg &
-fi
-
-source "$DOTFILES_PATH/env/x/xloadresources"
-source "$DOTFILES_PATH/variables.bash"
-
-# keyrepeat settings
-xset r rate 250 80 &
-
-# no screen blanking
-xset -dpms &
-xset s noblank &
-xset s off &
-
-# start the bar if we want it
-if [ "$BAR_ON_XINIT" -eq 1 ]; then
-  "$BAR_PATH/start.bash" &
-fi
-
-if [ -d "/usr/lib/nvidia" ]; then
-	export LD_LIBRARY_PATH=/usr/lib/nvidia
+if [ -f "$HOME/.xprofile" ]; then
+	source "$HOME/.xprofile"
 fi
 
 if [ -f "$HOME/.xinitrc.env" ]; then
 	source "$HOME/.xinitrc.env"
 fi
 
+# start the bar if we want it
+if [ "$BAR_ON_XINIT" -eq 1 ]; then
+  "$BAR_PATH/start.bash" &
+fi
+
 # fire up wm
 unclutter &
 compton &
 
 exec "$DOTFILES_PATH/env/wm/wmstart"
+# exec budgie-desktop
 
diff --git a/env/x/xprofile b/env/x/xprofile
new file mode 100644
index 0000000..da74392
--- /dev/null
+++ b/env/x/xprofile
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+if [ -f ~/.fehbg ]; then
+  ~/.fehbg &
+fi
+
+source "$DOTFILES_PATH/env/x/xloadresources"
+source "$DOTFILES_PATH/variables.bash"
+
+# keyrepeat settings
+xset r rate 250 80 &
+
+# no screen blanking
+xset -dpms &
+xset s noblank &
+xset s off &
+
+if [ -d "/usr/lib/nvidia" ]; then
+	export LD_LIBRARY_PATH=/usr/lib/nvidia
+fi
+
+if [ -f "$HOME/.xprofile.env" ]; then
+	source "$HOME/.xprofile.env"
+fi