theme fix

12 files changed, 60 insertions, 22 deletions

diff --git a/raveos-cosmic-theme/PKGBUILD b/raveos-cosmic-theme/PKGBUILD
index 163fdb1..00fc85a 100644
--- a/raveos-cosmic-theme/PKGBUILD
+++ b/raveos-cosmic-theme/PKGBUILD
@@ -15,7 +15,7 @@
 
 pkgname=raveos-cosmic-theme
 pkgver=0.0.0
-pkgrel=12
+pkgrel=13
 pkgdesc="RaveOS Cosmic theme payload and installer"
 arch=('any')
 url="https://raveos.local"
diff --git a/raveos-cosmic-theme/raveos-cosmic-theme-apply.service b/raveos-cosmic-theme/raveos-cosmic-theme-apply.service
index 92114f8..bc82b90 100644
--- a/raveos-cosmic-theme/raveos-cosmic-theme-apply.service
+++ b/raveos-cosmic-theme/raveos-cosmic-theme-apply.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Apply RaveOS Cosmic theme payload
-After=local-fs.target systemd-user-sessions.service
+After=local-fs.target
+Before=display-manager.service
 ConditionPathExists=!/var/lib/raveos-cosmic-theme/.applied
 
 [Service]
diff --git a/raveos-gnome-theme/PKGBUILD b/raveos-gnome-theme/PKGBUILD
index 9aec202..94fbe37 100644
--- a/raveos-gnome-theme/PKGBUILD
+++ b/raveos-gnome-theme/PKGBUILD
@@ -15,7 +15,7 @@
 
 pkgname=raveos-gnome-theme
 pkgver=0.0.0
-pkgrel=26
+pkgrel=28
 pkgdesc="RaveOS GNOME theme payload and installer"
 arch=('any')
 url="https://raveos.local"
diff --git a/raveos-gnome-theme/raveos-gnome-apply.sh b/raveos-gnome-theme/raveos-gnome-apply.sh
index faf6c29..c89aacb 100755
--- a/raveos-gnome-theme/raveos-gnome-apply.sh
+++ b/raveos-gnome-theme/raveos-gnome-apply.sh
@@ -170,7 +170,7 @@ install_user() {
                 gsettings set org.gnome.desktop.background picture-uri 'file://${target_home}/.config/background' || true
                 gsettings set org.gnome.desktop.background picture-uri-dark 'file://${target_home}/.config/background' || true
                 gsettings set org.gnome.shell.extensions.user-theme name 'Yaru-olive-dark' || true
-            " || true
+            " </dev/null >/dev/null 2>&1 || true
     fi
 
     rm -rf "$tmpdir"
diff --git a/raveos-gnome-theme/raveos-gnome-theme-apply.service b/raveos-gnome-theme/raveos-gnome-theme-apply.service
index be12b4e..28d38d5 100644
--- a/raveos-gnome-theme/raveos-gnome-theme-apply.service
+++ b/raveos-gnome-theme/raveos-gnome-theme-apply.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Apply RaveOS GNOME theme payload
-After=local-fs.target systemd-user-sessions.service
+After=local-fs.target
+Before=display-manager.service
 ConditionPathExists=!/var/lib/raveos-gnome-theme/.applied
 
 [Service]
diff --git a/raveos-gnome-theme/raveos-gnome-theme.install b/raveos-gnome-theme/raveos-gnome-theme.install
index 02f605f..58db3fe 100644
--- a/raveos-gnome-theme/raveos-gnome-theme.install
+++ b/raveos-gnome-theme/raveos-gnome-theme.install
@@ -1,14 +1,16 @@
-post_install() {
+_enable_apply_service() {
     if command -v systemctl >/dev/null 2>&1; then
         systemctl enable raveos-gnome-theme-apply.service >/dev/null 2>&1 || true
     fi
-    if [[ -x /usr/lib/raveos-gnome-theme/auto-apply.sh ]]; then
-        /usr/lib/raveos-gnome-theme/auto-apply.sh || true
-    fi
+}
+
+post_install() {
+    _enable_apply_service
 }
 
 post_upgrade() {
-    if [[ -x /usr/lib/raveos-gnome-theme/auto-apply.sh ]]; then
-        /usr/lib/raveos-gnome-theme/auto-apply.sh || true
-    fi
+    # Never rewrite a live GNOME session from inside a pacman transaction.
+    # The boot service applies the new payload before the display manager starts.
+    rm -f /var/lib/raveos-gnome-theme/.applied
+    _enable_apply_service
 }
diff --git a/raveos-hyprland-theme/PKGBUILD b/raveos-hyprland-theme/PKGBUILD
index 526e38f..6c4c3e9 100644
--- a/raveos-hyprland-theme/PKGBUILD
+++ b/raveos-hyprland-theme/PKGBUILD
@@ -14,7 +14,7 @@
 
 pkgname=raveos-hyprland-theme
 pkgver=0.0.0
-pkgrel=56
+pkgrel=58
 pkgdesc="RaveOS Hyprland theme payload and installer (includes DankMaterialShell)"
 arch=('any')
 url="https://raveos.local"
diff --git a/raveos-hyprland-theme/raveos-hyprland-apply.sh b/raveos-hyprland-theme/raveos-hyprland-apply.sh
index b35282b..8ca2a73 100644
--- a/raveos-hyprland-theme/raveos-hyprland-apply.sh
+++ b/raveos-hyprland-theme/raveos-hyprland-apply.sh
@@ -22,6 +22,30 @@ if [[ ${EUID} -ne 0 ]]; then
     exit 1
 fi
 
+# GTK/Thunar könyvjelzők: a Letöltésekből kapott lista /home/t útvonalai
+# helyett mindig az aktuális felhasználó home könyvtárára mutatunk.
+install_gtk_bookmarks() {
+    local home="$1"
+    local bookmarks="${home}/.config/gtk-3.0/bookmarks"
+    local tmp
+
+    mkdir -p "$(dirname "$bookmarks")"
+    tmp=$(mktemp)
+    [[ -f "$bookmarks" ]] && cat "$bookmarks" > "$tmp"
+
+    for entry in \
+        "file://${home}/Dokumentumok" \
+        "file://${home}/Zen%C3%A9k" \
+        "file://${home}/K%C3%A9pek" \
+        "file://${home}/Vide%C3%B3k" \
+        "file://${home}/Let%C3%B6lt%C3%A9sek"; do
+        grep -qxF "$entry" "$tmp" || printf '%s\n' "$entry" >> "$tmp"
+    done
+
+    install -m644 "$tmp" "$bookmarks"
+    rm -f "$tmp"
+}
+
 # ---------------------------------------------------------------------------
 # SKEL TELEPÍTÉS
 # Új usereknek (useradd által másolt /etc/skel tartalom)
@@ -77,6 +101,8 @@ done
 [[ -d "${PAYLOAD}/skel" ]] && \
     cp -r --no-preserve=ownership "${PAYLOAD}/skel/." /etc/skel/
 
+install_gtk_bookmarks /etc/skel
+
 # Háttérkép
 [[ -f "${PAYLOAD}/background.jpg" ]] && \
     install -Dm644 "${PAYLOAD}/background.jpg" /etc/skel/.config/background.jpg
@@ -158,6 +184,8 @@ SEOF
     [[ -d "${PAYLOAD}/skel" ]] && \
         cp -r --no-preserve=ownership "${PAYLOAD}/skel/." "$home/"
 
+    install_gtk_bookmarks "$home"
+
     # Háttérkép
     [[ -f "${PAYLOAD}/background.jpg" ]] && \
         install -Dm644 "${PAYLOAD}/background.jpg" "${home}/.config/background.jpg"
diff --git a/raveos-hyprland-theme/raveos-hyprland-theme-apply.service b/raveos-hyprland-theme/raveos-hyprland-theme-apply.service
index 7c630f2..3f5f52e 100644
--- a/raveos-hyprland-theme/raveos-hyprland-theme-apply.service
+++ b/raveos-hyprland-theme/raveos-hyprland-theme-apply.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Apply RaveOS Hyprland theme payload
-After=local-fs.target systemd-user-sessions.service
+After=local-fs.target
+Before=display-manager.service
 ConditionPathExists=!/var/lib/raveos-hyprland-theme/.applied
 
 [Service]
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
 }