From 6896dfa7ad2e05210f81eb3471ffdf2de4924a62 Mon Sep 17 00:00:00 2001
From: Lars Vierbergen <vierbergenlars@gmail.com>
Date: Tue, 2 Jul 2019 08:11:40 +0200
Subject: [PATCH] Move action-manager and battery-monitor to a systemd service

---
 xmonad-session-rc | 9 ++++++---
 xmonad.hs         | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/xmonad-session-rc b/xmonad-session-rc
index b717695..ec5e1aa 100644
--- a/xmonad-session-rc
+++ b/xmonad-session-rc
@@ -8,7 +8,6 @@ mate-session-daemon
 trayer --edge bottom --align right --SetDockType true --SetPartialStrut true --expand true --width 10 --transparent true --tint 0x000000 --alpha 0 --height 17 --monitor primary&
 xscreensaver -no-splash&
 nm-applet --sm-disable&
-~/.xmonad/action-manager/start.sh ~/.xmonad/actiondisplay ~/.xmonad/actioncontrol --state-file ~/.xmonad/actionstate --redshift-location 51:5 --redshift-temperature 6000:2000 --screenlayout-dir ~/.screenlayout --screenlayout-default standalone.sh&
 
 # Fix for java applications
 export _JAVA_AWT_WM_NONREPARENTING=1
@@ -21,20 +20,24 @@ export MOZ_USE_XINPUT2=1
 
 # Import environment in systemd
 systemctl --user import-environment PATH
+systemctl --user import-environment DISPLAY
 dbus-update-activation-environment --systemd SSH_AUTH_SOCK
 
 # Restart tl auto suspend to have the correct path
 systemctl --user restart tl-auto-suspend.service
+systemctl --user restart battery-monitor.service
+systemctl --user restart action-manager.service
 
 # Remove _NET_WORKAREA to fix some apps
 # https://github.com/xmonad/xmonad/issues/42#issuecomment-243422400
-xprop -root -remove _NET_WORKAREA
+sh -c 'while true; do xprop -root -remove _NET_WORKAREA; sleep 1; done'&
 
 # Auto-start applications
-bash ~/.xmonad/battery-monitor.sh&
 gajim&
 keepass2 ~/Nextcloud/passwords.kdbx&
 thunderbird&
 mate-terminal -e ssh-add ~/.ssh/id_rsa&
 dropbox start&
 nextcloud&
+slack&
+
diff --git a/xmonad.hs b/xmonad.hs
index e5953a5..7725869 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -48,6 +48,7 @@ workspaceManageHook = composeAll [
      className =? "Firefox" --> doShift "1:web"
     ,className =? "Thunderbird" --> doShift "2:com"
     ,className =? "Gajim" --> doShift "2:com"
+    ,className =? "slack" --> doShift "2:com"
     ,className =? "KeePass2" --> doShift "9:div"
     ,className =? "rhythmbox" --> doShift "8:media"
     ,className =? "vlc" --> doShift "8:media"