summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNippy <nippy@rp1.hu>2026-06-07 21:57:49 +0200
committerNippy <nippy@rp1.hu>2026-06-07 21:57:49 +0200
commitc50e5c9839c4a1f4b0972403d74023d7a9e1b4bb (patch)
tree54545cc56e0b5fb31faad5958e02da2771780735
parent8e474998c646a37b602d913092ab8f8fddd95242 (diff)
downloadRaveOS-PKGBUILD-c50e5c9839c4a1f4b0972403d74023d7a9e1b4bb.tar.gz
RaveOS-PKGBUILD-c50e5c9839c4a1f4b0972403d74023d7a9e1b4bb.zip
raveos-hyprland-theme: auto-remove legacy hyprland.conf (pkgrel 31)
Apply script now removes hyprland.conf when hyprland.lua exists, both in /etc/skel and per-user home directories.
-rw-r--r--raveos-hyprland-theme/PKGBUILD2
-rw-r--r--raveos-hyprland-theme/raveos-hyprland-apply.sh3
2 files changed, 4 insertions, 1 deletions
diff --git a/raveos-hyprland-theme/PKGBUILD b/raveos-hyprland-theme/PKGBUILD
index 283292f..8f67750 100644
--- a/raveos-hyprland-theme/PKGBUILD
+++ b/raveos-hyprland-theme/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=raveos-hyprland-theme
pkgver=0.0.0
-pkgrel=30
+pkgrel=31
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 1d0d5b4..443bfb6 100644
--- a/raveos-hyprland-theme/raveos-hyprland-apply.sh
+++ b/raveos-hyprland-theme/raveos-hyprland-apply.sh
@@ -18,6 +18,8 @@ fi
mkdir -p /etc/skel/.config/hypr
if [[ -d "${payload_dir}/hypr" ]]; then
cp -rf "${payload_dir}/hypr/." /etc/skel/.config/hypr/
+ # Remove legacy conf-based config if Lua version exists
+ [[ -f /etc/skel/.config/hypr/hyprland.lua ]] && rm -f /etc/skel/.config/hypr/hyprland.conf
fi
mkdir -p /etc/skel/.config/dms
@@ -121,6 +123,7 @@ while IFS=: read -r user _ uid gid _ home shell; do
pkill -u "$user" hyprpaper 2>/dev/null || true
if [[ -d "${payload_dir}/hypr" ]]; then
cp -rf "${payload_dir}/hypr/." "${home}/.config/hypr/"
+ [[ -f "${home}/.config/hypr/hyprland.lua" ]] && rm -f "${home}/.config/hypr/hyprland.conf"
fi
printf 'preload = %s/.config/background.jpg\nwallpaper = ,%s/.config/background.jpg\nsplash = false\n' \
"$home" "$home" > "${home}/.config/hypr/hyprpaper.conf"