From 04ae4335f206b708d757593f0cfee96a7316dc4b Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sat, 29 Oct 2016 12:31:08 -0700
Subject: [PATCH] [Linux] Taffybar now managed by xmonad instead of systemd

---
 dotfiles/config/systemd/user/dunst.service       |  1 -
 dotfiles/config/systemd/user/keepassx.service    |  1 -
 dotfiles/config/systemd/user/nm-applet.service   |  1 -
 dotfiles/config/systemd/user/pasystray.service   |  1 -
 dotfiles/config/systemd/user/screencloud.service |  1 -
 dotfiles/config/systemd/user/taffybar.service    | 10 ----------
 dotfiles/config/systemd/user/udiskie.service     |  1 -
 dotfiles/xmonad/xmonad.hs                        |  7 ++++---
 8 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 dotfiles/config/systemd/user/taffybar.service

diff --git a/dotfiles/config/systemd/user/dunst.service b/dotfiles/config/systemd/user/dunst.service
index 18620aef..e57e4aad 100644
--- a/dotfiles/config/systemd/user/dunst.service
+++ b/dotfiles/config/systemd/user/dunst.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Dunst
-Requires=taffybar.service
 After=taffybar.service
 
 [Service]
diff --git a/dotfiles/config/systemd/user/keepassx.service b/dotfiles/config/systemd/user/keepassx.service
index 1a91776d..94ec40fa 100644
--- a/dotfiles/config/systemd/user/keepassx.service
+++ b/dotfiles/config/systemd/user/keepassx.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=KeePassX
-Requires=taffybar.service
 After=taffybar.service
 
 [Service]
diff --git a/dotfiles/config/systemd/user/nm-applet.service b/dotfiles/config/systemd/user/nm-applet.service
index 732809d4..851586d2 100644
--- a/dotfiles/config/systemd/user/nm-applet.service
+++ b/dotfiles/config/systemd/user/nm-applet.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=NM Applet
-Requires=taffybar.service
 After=taffybar.service
 
 [Service]
diff --git a/dotfiles/config/systemd/user/pasystray.service b/dotfiles/config/systemd/user/pasystray.service
index 3cf27764..f7976cdc 100644
--- a/dotfiles/config/systemd/user/pasystray.service
+++ b/dotfiles/config/systemd/user/pasystray.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Pulse Audio System Tray
-Requires=taffybar.service
 After=taffybar.service
 
 [Service]
diff --git a/dotfiles/config/systemd/user/screencloud.service b/dotfiles/config/systemd/user/screencloud.service
index 9ef86b13..4149c6ee 100644
--- a/dotfiles/config/systemd/user/screencloud.service
+++ b/dotfiles/config/systemd/user/screencloud.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=ScreenCloud
-Requires=taffybar.service
 After=taffybar.service
 
 [Service]
diff --git a/dotfiles/config/systemd/user/taffybar.service b/dotfiles/config/systemd/user/taffybar.service
deleted file mode 100644
index 30210c3a..00000000
--- a/dotfiles/config/systemd/user/taffybar.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=taffybar
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/env taffybar
-ExecStop=/usr/bin/pkill taffybar
-
-[Install]
-WantedBy=wm.target
diff --git a/dotfiles/config/systemd/user/udiskie.service b/dotfiles/config/systemd/user/udiskie.service
index 6efc8a4c..7f9be0a4 100644
--- a/dotfiles/config/systemd/user/udiskie.service
+++ b/dotfiles/config/systemd/user/udiskie.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=udiskie
-Requires=taffybar.service
 After=taffybar.service
 
 [Service]
diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index 2043d3e9..0c979323 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -65,7 +65,9 @@ virtualClasses = [(hangoutsSelector, "Hangouts")]
 
 -- Startup
 
-myStartup = spawn "systemctl --user start wm.target"
+myStartup = do
+  spawn "taffybar"
+  spawn "systemctl --user start wm.target"
 
 -- Manage
 
@@ -204,8 +206,7 @@ addKeys conf@XConfig {modMask = modm} =
     , ((modm .|. shiftMask, xK_p), spawn "rofi -show run")
     , ((modm, xK_g), actionMenu myWindowBringerConfig greedyFocusWindow)
     , ((modm, xK_b), bringMenuConfig myWindowBringerConfig)
-    , ((modm .|. controlMask, xK_t), spawn
-       "systemctl --user restart taffybar.service")
+    , ((modm .|. controlMask, xK_t), spawn "restart.sh taffybar")
     , ((modm, xK_v), spawn "copyq paste")
     , ((modm, xK_s), swapNextScreen)
     , ((modm .|. controlMask, xK_space), sendMessage $ JumpToLayout "Full")