From aa88e8bda9cdd9971e319704b68d8327af7c4ab0 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 26 Sep 2016 12:55:30 -0700
Subject: [PATCH] [Linux] Use wm.target for starting graphical apps

---
 dotfiles/config/systemd/user/copyq.service        | 2 +-
 dotfiles/config/systemd/user/keepassx.service     | 5 +++--
 dotfiles/config/systemd/user/nm-applet.service    | 2 +-
 dotfiles/config/systemd/user/screencloud.service  | 3 ++-
 dotfiles/config/systemd/user/sparkleshare.service | 2 +-
 dotfiles/config/systemd/user/udiskie.service      | 2 +-
 dotfiles/config/systemd/user/wm.target            | 3 +++
 dotfiles/config/systemd/user/xsettingsd.service   | 9 +++++++++
 dotfiles/xmonad/xmonad.hs                         | 2 +-
 dotfiles/xprofile                                 | 2 --
 dotfiles/xsettingsd                               | 1 +
 11 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 dotfiles/config/systemd/user/wm.target
 create mode 100644 dotfiles/config/systemd/user/xsettingsd.service
 create mode 100644 dotfiles/xsettingsd

diff --git a/dotfiles/config/systemd/user/copyq.service b/dotfiles/config/systemd/user/copyq.service
index 7fdc63fb..f7d382ca 100644
--- a/dotfiles/config/systemd/user/copyq.service
+++ b/dotfiles/config/systemd/user/copyq.service
@@ -7,4 +7,4 @@ ExecStart=/usr/bin/copyq
 ExecStop=/usr/bin/pkill copyq
 
 [Install]
-WantedBy=graphical.target
+WantedBy=wm.target
diff --git a/dotfiles/config/systemd/user/keepassx.service b/dotfiles/config/systemd/user/keepassx.service
index d76f8704..6019dc00 100644
--- a/dotfiles/config/systemd/user/keepassx.service
+++ b/dotfiles/config/systemd/user/keepassx.service
@@ -3,8 +3,9 @@ Description=KeePassX
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/zsh -c "start_keepass.sh"
+ExecStart=/usr/bin/zsh -c 'keepassx --keyfile "$HOME/SparkleShare/config/creds/keepass.key" "$HOME/SparkleShare/config/db.kdbx" &'
 ExecStop=/usr/bin/pkill keepassx
+RemainAfterExit=true
 
 [Install]
-WantedBy=graphical.target
+WantedBy=wm.target
diff --git a/dotfiles/config/systemd/user/nm-applet.service b/dotfiles/config/systemd/user/nm-applet.service
index dd92cabc..5a0a2285 100644
--- a/dotfiles/config/systemd/user/nm-applet.service
+++ b/dotfiles/config/systemd/user/nm-applet.service
@@ -7,4 +7,4 @@ ExecStart=/usr/bin/nm-applet --sm-disable
 ExecStop=/usr/bin/pkill nm-applet
 
 [Install]
-WantedBy=graphical.target
+WantedBy=wm.target
diff --git a/dotfiles/config/systemd/user/screencloud.service b/dotfiles/config/systemd/user/screencloud.service
index 5cefd12b..4149c6ee 100644
--- a/dotfiles/config/systemd/user/screencloud.service
+++ b/dotfiles/config/systemd/user/screencloud.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=ScreenCloud
+After=taffybar.service
 
 [Service]
 Type=simple
@@ -7,4 +8,4 @@ ExecStart=/usr/bin/screencloud
 ExecStop=/usr/bin/pkill screencloud
 
 [Install]
-WantedBy=graphical.target
+WantedBy=wm.target
diff --git a/dotfiles/config/systemd/user/sparkleshare.service b/dotfiles/config/systemd/user/sparkleshare.service
index 0957f434..61b3e617 100644
--- a/dotfiles/config/systemd/user/sparkleshare.service
+++ b/dotfiles/config/systemd/user/sparkleshare.service
@@ -7,4 +7,4 @@ ExecStop=/usr/bin/sparkleshare stop
 Type=forking
 
 [Install]
-WantedBy=graphical.target
+WantedBy=wm.target
diff --git a/dotfiles/config/systemd/user/udiskie.service b/dotfiles/config/systemd/user/udiskie.service
index 250e7adc..3f767016 100644
--- a/dotfiles/config/systemd/user/udiskie.service
+++ b/dotfiles/config/systemd/user/udiskie.service
@@ -6,4 +6,4 @@ ExecStart=/usr/bin/udiskie --tray
 Restart=always
 
 [Install]
-WantedBy=default.target
+WantedBy=wm.target
diff --git a/dotfiles/config/systemd/user/wm.target b/dotfiles/config/systemd/user/wm.target
new file mode 100644
index 00000000..4a4ab2e4
--- /dev/null
+++ b/dotfiles/config/systemd/user/wm.target
@@ -0,0 +1,3 @@
+[Unit]
+Description=Window Manager
+AllowIsolate=yes
diff --git a/dotfiles/config/systemd/user/xsettingsd.service b/dotfiles/config/systemd/user/xsettingsd.service
new file mode 100644
index 00000000..b04b3b9c
--- /dev/null
+++ b/dotfiles/config/systemd/user/xsettingsd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=X Settings Daemon
+
+[Service]
+ExecStart=/usr/bin/xsettingsd
+ExecStop=/usr/bin/pkill xsettingsd
+
+[Install]
+WantedBy=wm.target
diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs
index b0945555..6826d5ba 100644
--- a/dotfiles/xmonad/xmonad.hs
+++ b/dotfiles/xmonad/xmonad.hs
@@ -54,7 +54,7 @@ myLayoutHook = avoidStruts . smartSpacing 10 . noBorders
                . mkToggle (MIRROR ?? EOT) $ layouts
 
 myStartup = do
-  spawn "taffybar"
+  spawn "systemctl --user isolate wm.target"
   spawn "xsetroot -solid black"
   -- TODO: Figure out how to set different backgrounds for different x
   -- monitors
diff --git a/dotfiles/xprofile b/dotfiles/xprofile
index 3def6111..8f1a9fb7 100644
--- a/dotfiles/xprofile
+++ b/dotfiles/xprofile
@@ -1,4 +1,2 @@
 # -*- mode: sh; -*-
 source "$HOME/.lib/shellenv.sh"
-# XXX: This is here literally only to get emacs keybindings in chrome
-run_if_exists gnome-settings-daemon &
diff --git a/dotfiles/xsettingsd b/dotfiles/xsettingsd
new file mode 100644
index 00000000..95068154
--- /dev/null
+++ b/dotfiles/xsettingsd
@@ -0,0 +1 @@
+Gtk/KeyThemeName "Emacs"