diff options
Diffstat (limited to 'raveos-hyprland-theme')
| -rw-r--r-- | raveos-hyprland-theme/PKGBUILD | 2 | ||||
| -rw-r--r-- | raveos-hyprland-theme/raveos-hyprland-apply.sh | 40 |
2 files changed, 20 insertions, 22 deletions
diff --git a/raveos-hyprland-theme/PKGBUILD b/raveos-hyprland-theme/PKGBUILD index 2a1d6ea..c8f7b6f 100644 --- a/raveos-hyprland-theme/PKGBUILD +++ b/raveos-hyprland-theme/PKGBUILD @@ -10,7 +10,7 @@ pkgname=raveos-hyprland-theme pkgver=0.0.0 -pkgrel=44 +pkgrel=45 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 ed296c4..df625e4 100644 --- a/raveos-hyprland-theme/raveos-hyprland-apply.sh +++ b/raveos-hyprland-theme/raveos-hyprland-apply.sh @@ -172,8 +172,11 @@ while IFS=: read -r user _ uid gid _ home shell; do # Icon és GTK téma beállítása (dconf/gsettings) # A settings.ini nem elég — a GTK daemonok a dconf-ot olvassák - runuser -u "$user" -- dbus-launch gsettings set org.gnome.desktop.interface gtk-theme 'Yaru-olive-dark' 2>/dev/null || true - runuser -u "$user" -- dbus-launch gsettings set org.gnome.desktop.interface icon-theme 'Adwaitaru-olive' 2>/dev/null || true + # Chroot-ban (Calamares) dbus-launch lehet hogy nincs — ezért set +e + ( + runuser -u "$user" -- dbus-launch gsettings set org.gnome.desktop.interface gtk-theme 'Yaru-olive-dark' 2>/dev/null + runuser -u "$user" -- dbus-launch gsettings set org.gnome.desktop.interface icon-theme 'Adwaitaru-olive' 2>/dev/null + ) || true # XDG user könyvtárak (Letöltések, Dokumentumok stb.) runuser -u "$user" -- xdg-user-dirs-update 2>/dev/null || true @@ -187,25 +190,20 @@ while IFS=: read -r user _ uid gid _ home shell; do fi # hyprpaper újraindítás, ha Hyprland fut - xdg_run="/run/user/${uid}" - hypr_sig=$(ls "${xdg_run}/hypr/" 2>/dev/null | tail -1) - if [[ -n "$hypr_sig" ]]; then - # Először a régit leállítjuk - runuser -u "$user" -- env \ - XDG_RUNTIME_DIR="${xdg_run}" \ - HYPRLAND_INSTANCE_SIGNATURE="${hypr_sig}" \ - hyprctl dispatch killall hyprpaper 2>/dev/null || true - sleep 1 - # Újat indítunk (Lua módban a hyprctl dispatch exec nem működik) - runuser -u "$user" -- env \ - XDG_RUNTIME_DIR="${xdg_run}" \ - XDG_SESSION_TYPE=wayland \ - XDG_CURRENT_DESKTOP=Hyprland \ - HYPRLAND_INSTANCE_SIGNATURE="${hypr_sig}" \ - WAYLAND_DISPLAY=wayland-1 \ - LIBGL_ALWAYS_SOFTWARE=1 \ - hyprpaper 2>/dev/null & - disown + # Chroot-ban (Calamares telepítés) ez nem fut — nincs session + if [[ -d "/run/user/${uid}/hypr" ]]; then + xdg_run="/run/user/${uid}" + hypr_sig=$(ls "${xdg_run}/hypr/" 2>/dev/null | tail -1) + if [[ -n "$hypr_sig" ]]; then + runuser -u "$user" -- env \ + XDG_RUNTIME_DIR="${xdg_run}" \ + XDG_SESSION_TYPE=wayland \ + XDG_CURRENT_DESKTOP=Hyprland \ + HYPRLAND_INSTANCE_SIGNATURE="${hypr_sig}" \ + WAYLAND_DISPLAY=wayland-1 \ + LIBGL_ALWAYS_SOFTWARE=1 \ + hyprpaper 2>/dev/null & + fi fi done < /etc/passwd |