From 68d6cff1a4a10fb383da4bd3c8ae69f219d0bc90 Mon Sep 17 00:00:00 2001
From: Sunderland93 <samoilov.lex@gmail.com>
Date: Mon, 4 Sep 2023 00:37:17 +0400
Subject: [PATCH] Add more services

---
 etc/sway/config.d/40-autostart-applications.conf |  4 ----
 etc/sway/variables                               | 12 ------------
 usr/lib/systemd/user/autoname-workspaces.service | 11 +++++++++++
 usr/lib/systemd/user/calcurse.service            | 11 +++++++++++
 usr/lib/systemd/user/pcmanfm-qt.service          | 11 +++++++++++
 5 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 usr/lib/systemd/user/autoname-workspaces.service
 create mode 100644 usr/lib/systemd/user/calcurse.service
 create mode 100644 usr/lib/systemd/user/pcmanfm-qt.service

diff --git a/etc/sway/config.d/40-autostart-applications.conf b/etc/sway/config.d/40-autostart-applications.conf
index 36c193e..64cb6cb 100644
--- a/etc/sway/config.d/40-autostart-applications.conf
+++ b/etc/sway/config.d/40-autostart-applications.conf
@@ -9,13 +9,9 @@ exec {
     $help_menu
     $cliphist_store
     $cliphist_watch
-    $autoname_workspaces
-    $pcmanfm_daemon
 }
 exec_always {
     $kanshi
-    $nwg_drawer_daemon
     $watch_playerctl
-    $calendar_daemon
     $update_rofi_theme
 }
diff --git a/etc/sway/variables b/etc/sway/variables
index 8cca5e7..d214484 100644
--- a/etc/sway/variables
+++ b/etc/sway/variables
@@ -94,30 +94,18 @@ set $wlsunset '[ -x "$(command -v wlsunset)" ] && /usr/share/sway/scripts/sunset
 # Autotiling script
 set $autotiling '[ -x "$(command -v autotiling)" ] && autotiling -w 1 3 5 7 9'
 
-# Automatic workspace names
-set $autoname_workspaces '[ -f /usr/share/sway/scripts/autoname-workspaces.py ] && /usr/share/sway/scripts/autoname-workspaces.py'
-
 # restart kanshi https://github.com/emersion/kanshi/issues/43#issuecomment-531679213
 set $kanshi '[ -x "$(command -v kanshi)" ] && pkill kanshi; exec kanshi'
 
-# Start PCmanFM-Qt as a daemon
-set $pcmanfm_daemon '[ -x "$(command -v pcmanfm)" ] && pcmanfm-qt -d'
-
 # Clipboard manager
 set $cliphist_store '[ -x "$(command -v wl-paste)" ] && [ -x "$(command -v cliphist)" ] && wl-paste --watch cliphist store'
 set $cliphist_watch '[ -x "$(command -v wl-paste)" ] && [ -x "$(command -v cliphist)" ] && wl-paste --watch pkill -RTMIN+9 waybar'
 
-# Start nwg-drawer as a daemon
-set $nwg_drawer_daemon '[ -x "$(command -v nwg-drawer)" ] && nwg-drawer -r'
-
 # Start playerctl as daemon
 set $watch_playerctl '[ -x "$(command -v playerctl)" ] && pkill playerctl; playerctl -a metadata --format \'{{status}} {{title}}\' --follow | while read line; do pkill -RTMIN+5 waybar; done'
 
 # Update Rofi theme based on $rofi_theme colors
 set $update_rofi_theme mkdir -p $HOME/.config/rofi/ && echo $rofi_theme > $HOME/.config/rofi/config.rasi
 
-# Start Calcurse calendar as a daemon
-set $calendar_daemon 'calcurse --daemon'
-
 # Notifications from Swappy
 set $swappy_notify '[ -x "$(command -v swappy)" ] && /usr/share/sway/scripts/screenshot-notify.sh'
diff --git a/usr/lib/systemd/user/autoname-workspaces.service b/usr/lib/systemd/user/autoname-workspaces.service
new file mode 100644
index 0000000..4c2b2a7
--- /dev/null
+++ b/usr/lib/systemd/user/autoname-workspaces.service
@@ -0,0 +1,11 @@
+[Unit]
+Requires=sway-session.target
+ConditionPathExists=/usr/share/sway/scripts/autoname-workspaces.py
+
+[Service]
+ExecStart=/usr/share/sway/scripts/autoname-workspaces.py
+Restart=on-failure
+RestartSec=1
+
+[Install]
+WantedBy=sway-session.target
diff --git a/usr/lib/systemd/user/calcurse.service b/usr/lib/systemd/user/calcurse.service
new file mode 100644
index 0000000..c6ceeff
--- /dev/null
+++ b/usr/lib/systemd/user/calcurse.service
@@ -0,0 +1,11 @@
+[Unit]
+Requires=sway-session.target
+ConditionPathExists=/usr/bin/calcurse
+
+[Service]
+ExecStart=/usr/bin/calcurse --daemon
+Restart=on-failure
+RestartSec=1
+
+[Install]
+WantedBy=sway-session.target
diff --git a/usr/lib/systemd/user/pcmanfm-qt.service b/usr/lib/systemd/user/pcmanfm-qt.service
new file mode 100644
index 0000000..2e873f1
--- /dev/null
+++ b/usr/lib/systemd/user/pcmanfm-qt.service
@@ -0,0 +1,11 @@
+[Unit]
+Requires=sway-session.target
+ConditionPathExists=/usr/bin/pcmanfm-qt
+
+[Service]
+ExecStart=/usr/bin/pcmanfm-qt -d
+Restart=on-failure
+RestartSec=1
+
+[Install]
+WantedBy=sway-session.target