From 254e4d31b98d00f39e7f5d6f209cee2adce68ec9 Mon Sep 17 00:00:00 2001
From: Nippy <nippy@rp1.hu>
Date: Thu, 7 May 2026 22:13:02 +0200
Subject: raveos-hyprland-theme: merge RaveOS-Hyprland into theme-data, bump
 pkgrel=12

- Remove RaveOS-Hyprland/ directory (configs merged into theme-data/)
- Move gtk-3.0, gtk-4.0, nwg-look, Thunar, xfce4, xsettingsd into theme-data/
- Update PKGBUILD: pkgrel=12, remove RaveOS-Hyprland copy step
- Update apply.sh: handle new theme-data subdirs (gtk, nwg-look, Thunar, xfce4, xsettingsd)
- Sync hyprland.conf, monitors.conf, workspaces.conf, kitty.conf
---
 raveos-hyprland-theme/raveos-hyprland-apply.sh | 27 ++++++++++++--------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'raveos-hyprland-theme/raveos-hyprland-apply.sh')

diff --git a/raveos-hyprland-theme/raveos-hyprland-apply.sh b/raveos-hyprland-theme/raveos-hyprland-apply.sh
index 0fcfb63..44ac63d 100644
--- a/raveos-hyprland-theme/raveos-hyprland-apply.sh
+++ b/raveos-hyprland-theme/raveos-hyprland-apply.sh
@@ -2,7 +2,6 @@
 set -euo pipefail
 
 payload_dir="/usr/share/raveos/hyprland-theme/theme-data"
-config_dir="/usr/share/raveos/hyprland-theme/RaveOS-Hyprland"
 
 if [[ ! -d "$payload_dir" ]]; then
   echo "Missing payload: $payload_dir" >&2
@@ -62,13 +61,12 @@ if [[ -f "${payload_dir}/background" ]]; then
   install -Dm644 "${payload_dir}/background" /etc/skel/.config/background
 fi
 
-if [[ -d "$config_dir" ]]; then
-  for d in "${config_dir}"/*/; do
-    name=$(basename "$d")
-    mkdir -p "/etc/skel/.config/${name}"
-    cp -rf "${d}." "/etc/skel/.config/${name}/"
-  done
-fi
+for d in gtk-3.0 gtk-4.0 nwg-look Thunar xfce4 xsettingsd; do
+  if [[ -d "${payload_dir}/${d}" ]]; then
+    mkdir -p "/etc/skel/.config/${d}"
+    cp -rf "${payload_dir}/${d}/." "/etc/skel/.config/${d}/"
+  fi
+done
 
 if [[ -f "${payload_dir}/sddm/sddm.conf" ]]; then
   install -Dm644 "${payload_dir}/sddm/sddm.conf" /etc/sddm.conf.d/raveos-theme.conf
@@ -131,13 +129,12 @@ while IFS=: read -r user _ uid gid _ home shell; do
   if [[ -f "${payload_dir}/hypr/scripts/raveos-monitor-setup.sh" ]]; then
     bash "${payload_dir}/hypr/scripts/raveos-monitor-setup.sh" --hypr-dir "${home}/.config/hypr"
   fi
-  if [[ -d "$config_dir" ]]; then
-    for d in "${config_dir}"/*/; do
-      name=$(basename "$d")
-      mkdir -p "${home}/.config/${name}"
-      cp -rf "${d}." "${home}/.config/${name}/"
-    done
-  fi
+  for d in gtk-3.0 gtk-4.0 nwg-look Thunar xfce4 xsettingsd; do
+    if [[ -d "${payload_dir}/${d}" ]]; then
+      mkdir -p "${home}/.config/${d}"
+      cp -rf "${payload_dir}/${d}/." "${home}/.config/${d}/"
+    fi
+  done
   chown -R "${uid}:${gid}" "$home"
 done < /etc/passwd
 
-- 
cgit v1.3