Cleanup systemd services

8 files changed, 37 insertions, 13 deletions

diff --git a/.linux/dot_config/systemd/user/music-backup.service b/.linux/dot_config/systemd/user/music-backup.service
index 7a83c15..07c37f7 100644
--- a/.linux/dot_config/systemd/user/music-backup.service
+++ b/.linux/dot_config/systemd/user/music-backup.service
@@ -3,9 +3,7 @@ Description=backup music with rsync
 
 [Service]
 Type=oneshot
-
 ExecCondition=ping -q -c1 -W1 -w1 nas.sea1.crute.me
-
 ExecStart=rsync -rltvp -e "ssh -i /home/mcrute/.ssh/id_rsa.musicbackup -l mcrute" --delete-excluded --delete-during --exclude '/Swinsian/Artwork/' /home/mcrute/Music/Swinsian nas.sea1.crute.me:/mnt/data/Mike/Music/
 
 [Install]
diff --git a/.linux/dot_config/systemd/user/system-backup.service b/.linux/dot_config/systemd/user/system-backup.service
index 61ed2de..8a3a8ac 100644
--- a/.linux/dot_config/systemd/user/system-backup.service
+++ b/.linux/dot_config/systemd/user/system-backup.service
@@ -6,9 +6,7 @@ ConditionPathExists=%h/.backup-filter
 
 [Service]
 Type=oneshot
-
 ExecCondition=ping -q -c1 -W1 -w1 nas.sea1.crute.me
-
 Environment="RESTIC_REPOSITORY=rest:http://nas.sea1.crute.me:6275/mcrute-devices"
 Environment="RESTIC_PASSWORD_FILE=%h/.restic-key"
 ExecStart=restic backup --exclude-file %h/.backup-filter %h
diff --git a/.linux/dot_config/systemd/user/xscreensaver.service b/.linux/dot_config/systemd/user/xscreensaver.service
index 88fe661..e602a50 100644
--- a/.linux/dot_config/systemd/user/xscreensaver.service
+++ b/.linux/dot_config/systemd/user/xscreensaver.service
@@ -5,7 +5,7 @@ PartOf=graphical-session.target
 [Service]
 Type=simple
 EnvironmentFile=-%h/.config/systemd/graphical.env
-ExecStart=/usr/bin/xscreensaver
+ExecStart=/usr/bin/xscreensaver --no-splash
 
 [Install]
 WantedBy=graphical-session.target
diff --git a/.linux/dot_config/systemd/user/xss-lock.service b/.linux/dot_config/systemd/user/xss-lock.service
new file mode 100644
index 0000000..34d1ddc
--- /dev/null
+++ b/.linux/dot_config/systemd/user/xss-lock.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=xss-lock glue for systemd and xscreensaver
+PartOf=graphical-session.target
+
+[Service]
+Type=simple
+EnvironmentFile=-%h/.config/systemd/graphical.env
+ExecStart=/usr/bin/xss-lock -- xscreensaver-command -lock
+
+[Install]
+WantedBy=graphical-session.target
diff --git a/.linux/etc/systemd/system/ath11k-resume.service b/.linux/etc/systemd/system/ath11k-resume.service
index 0b32151..ca4afd5 100644
--- a/.linux/etc/systemd/system/ath11k-resume.service
+++ b/.linux/etc/systemd/system/ath11k-resume.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Resume: modprobe ath11k_pci
-After=suspend.target
-After=hibernate.target
+After=suspend.target hibernate.target hybrid-sleep.target
 
 [Service]
 Type=oneshot
@@ -9,5 +8,4 @@ ExecStartPre=/usr/bin/sleep 3
 ExecStart=/usr/sbin/modprobe ath11k_pci
 
 [Install]
-WantedBy=suspend.target
-WantedBy=hibernate.target
+WantedBy=suspend.target hibernate.target hybrid-sleep.target
diff --git a/.linux/etc/systemd/system/ath11k-suspend.service b/.linux/etc/systemd/system/ath11k-suspend.service
index adf0957..3f69497 100644
--- a/.linux/etc/systemd/system/ath11k-suspend.service
+++ b/.linux/etc/systemd/system/ath11k-suspend.service
@@ -1,12 +1,10 @@
 [Unit]
 Description=Suspend: rmmod ath11k_pci
-Before=sleep.target
-Before=hibernate.target
+Before=sleep.target hibernate.target hybrid-sleep.target
 
 [Service]
 Type=oneshot
 ExecStart=/usr/sbin/rmmod ath11k_pci
 
 [Install]
-WantedBy=sleep.target
-WantedBy=hibernate.target
+WantedBy=sleep.target hibernate.target hybrid-sleep.target
diff --git a/.linux/etc/systemd/system/ax500-resume.service b/.linux/etc/systemd/system/ax500-resume.service
new file mode 100644
index 0000000..5697f2a
--- /dev/null
+++ b/.linux/etc/systemd/system/ax500-resume.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Resume: modprobe hci_uart
+After=suspend.target hibernate.target hybrid-sleep.target
+
+[Service]
+Type=oneshot
+ExecStartPre=/usr/bin/sleep 3
+ExecStart=/usr/sbin/modprobe hci_uart
+
+[Install]
+WantedBy=suspend.target hibernate.target hybrid-sleep.target
diff --git a/.linux/etc/systemd/system/ax500-suspend.service b/.linux/etc/systemd/system/ax500-suspend.service
new file mode 100644
index 0000000..a1e5ed3
--- /dev/null
+++ b/.linux/etc/systemd/system/ax500-suspend.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Suspend: rmmod hci_uart
+Before=sleep.target hibernate.target hybrid-sleep.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rmmod hci_uart
+
+[Install]
+WantedBy=sleep.target hibernate.target hybrid-sleep.target