From 22e2e5dec606cdbf42fcb71b650ccaae5dc5a40f Mon Sep 17 00:00:00 2001
From: nippy <nippy@tuta.io>
Date: Thu, 13 Aug 2026 19:24:23 +0200
Subject: fix hyperland

---
 raveos-hyprland-theme/raveos-hyprland-apply.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 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 678c8df..327ac33 100644
--- a/raveos-hyprland-theme/raveos-hyprland-apply.sh
+++ b/raveos-hyprland-theme/raveos-hyprland-apply.sh
@@ -46,25 +46,30 @@ install_gtk_bookmarks() {
     rm -f "$tmp"
 }
 
-# Hyprland billentyuzet-kiosztas: a Calamares altal beallitott layout atvetele
-# (a /etc/default/keyboard XKBLAYOUT-ja) a hyprland.lua input szekciojaba.
+# Hyprland billentyuzet-kiosztas: a Calamares (systemd-localed) altal beallitott
+# layout/variant atvetele az X11 konfigbol a hyprland.lua input szekciojaba.
 set_hypr_keyboard() {
     local hypr_lua="$1"
     local kb_layout="hu"
+    local kb_variant=""
+    local xorg_kb="/etc/X11/xorg.conf.d/00-keyboard.conf"
     local kb_tmp
     [[ -f "$hypr_lua" ]] || return 0
-    if [[ -f /etc/default/keyboard ]]; then
+    if [[ -f "${xorg_kb}" ]]; then
+        kb_tmp="$(awk '/XkbLayout/ {print $3}' "${xorg_kb}" 2>/dev/null | tr -d '"' | head -1)"
+        [[ -n "$kb_tmp" ]] && kb_layout="${kb_tmp%%,*}"
+        kb_tmp="$(awk '/XkbVariant/ {print $3}' "${xorg_kb}" 2>/dev/null | tr -d '"' | head -1)"
+        [[ -n "$kb_tmp" ]] && kb_variant="${kb_tmp%%,*}"
+    elif [[ -f /etc/default/keyboard ]]; then
         kb_tmp="$(awk -F'"' '/^XKBLAYOUT=/{print $2; exit}' /etc/default/keyboard 2>/dev/null)"
         [[ -n "$kb_tmp" ]] && kb_layout="${kb_tmp%%,*}"
+        kb_tmp="$(awk -F'"' '/^XKBVARIANT=/{print $2; exit}' /etc/default/keyboard 2>/dev/null)"
+        [[ -n "$kb_tmp" ]] && kb_variant="${kb_tmp%%,*}"
     fi
     sed -i "s/kb_layout[[:space:]]*=[[:space:]]*\"\"/kb_layout = \"${kb_layout}\"/" "$hypr_lua"
+    sed -i "s/kb_variant[[:space:]]*=[[:space:]]*\"\"/kb_variant = \"${kb_variant}\"/" "$hypr_lua"
 }
 
-# ---------------------------------------------------------------------------
-# SKEL TELEPÍTÉS
-# Új usereknek (useradd által másolt /etc/skel tartalom)
-# ---------------------------------------------------------------------------
-
 # Hyprland Lua konfig (hyprland.lua + config/ könyvtár)
 mkdir -p /etc/skel/.config/hypr
 if [[ -d "${PAYLOAD}/hypr" ]]; then
@@ -142,11 +147,6 @@ done
 
 # SDDM: a téma és konfig a PKGBUILD által van telepítve, itt nincs teendő
 
-# ---------------------------------------------------------------------------
-# MEGLÉVŐ USEREK FRISSÍTÉSE
-# /etc/passwd alapján minden UID >= 1000 bejelentkező user home-ja
-# ---------------------------------------------------------------------------
-
 while IFS=: read -r user _ uid gid _ home shell; do
     [[ "$uid" -ge 1000 ]] || continue
     [[ -d "$home" ]] || continue
-- 
cgit v1.3