3 files changed, 13 insertions, 8 deletions
diff --git a/raveos-plasma-theme/PKGBUILD b/raveos-plasma-theme/PKGBUILD
index 7bd0b78..fb42fef 100644
--- a/raveos-plasma-theme/PKGBUILD
+++ b/raveos-plasma-theme/PKGBUILD
@@ -15,7 +15,7 @@
 
 pkgname=raveos-plasma-theme
 pkgver=0.0.0
-pkgrel=34
+pkgrel=35
 pkgdesc="RaveOS Plasma theme payload and installer"
 arch=('any')
 url="https://raveos.local"
diff --git a/raveos-plasma-theme/raveos-plasma-theme-apply.service b/raveos-plasma-theme/raveos-plasma-theme-apply.service
index b506972..90cfc9c 100644
--- a/raveos-plasma-theme/raveos-plasma-theme-apply.service
+++ b/raveos-plasma-theme/raveos-plasma-theme-apply.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Apply RaveOS Plasma theme payload
-After=local-fs.target systemd-user-sessions.service
+After=local-fs.target
+Before=display-manager.service
 ConditionPathExists=!/var/lib/raveos-plasma-theme/.applied
 
 [Service]
diff --git a/raveos-plasma-theme/raveos-plasma-theme.install b/raveos-plasma-theme/raveos-plasma-theme.install
index a61ed75..9461d16 100644
--- a/raveos-plasma-theme/raveos-plasma-theme.install
+++ b/raveos-plasma-theme/raveos-plasma-theme.install
@@ -1,11 +1,15 @@
-post_install() {
-    if [[ -x /usr/lib/raveos-plasma-theme/auto-apply.sh ]]; then
-        /usr/lib/raveos-plasma-theme/auto-apply.sh || true
+_enable_apply_service() {
+    if command -v systemctl >/dev/null 2>&1; then
+        systemctl enable raveos-plasma-theme-apply.service >/dev/null 2>&1 || true
     fi
 }
 
+post_install() {
+    _enable_apply_service
+}
+
 post_upgrade() {
-    if [[ -x /usr/lib/raveos-plasma-theme/auto-apply.sh ]]; then
-        /usr/lib/raveos-plasma-theme/auto-apply.sh || true
-    fi
+    # Do not rewrite a live Plasma session from inside a pacman transaction.
+    rm -f /var/lib/raveos-plasma-theme/.applied
+    _enable_apply_service
 }