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 | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/raveos-hyprland-theme/PKGBUILD b/raveos-hyprland-theme/PKGBUILD index 6c4c3e9..5c5cd62 100644 --- a/raveos-hyprland-theme/PKGBUILD +++ b/raveos-hyprland-theme/PKGBUILD @@ -14,7 +14,7 @@ pkgname=raveos-hyprland-theme pkgver=0.0.0 -pkgrel=58 +pkgrel=59 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 8ca2a73..678c8df 100644 --- a/raveos-hyprland-theme/raveos-hyprland-apply.sh +++ b/raveos-hyprland-theme/raveos-hyprland-apply.sh @@ -46,6 +46,20 @@ 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. +set_hypr_keyboard() { + local hypr_lua="$1" + local kb_layout="hu" + local kb_tmp + [[ -f "$hypr_lua" ]] || return 0 + if [[ -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%%,*}" + fi + sed -i "s/kb_layout[[:space:]]*=[[:space:]]*\"\"/kb_layout = \"${kb_layout}\"/" "$hypr_lua" +} + # --------------------------------------------------------------------------- # SKEL TELEPÍTÉS # Új usereknek (useradd által másolt /etc/skel tartalom) @@ -57,6 +71,7 @@ if [[ -d "${PAYLOAD}/hypr" ]]; then cp -rf "${PAYLOAD}/hypr/." /etc/skel/.config/hypr/ # Ha Lua konfig létezik, a legacy .conf-ot töröljük [[ -f /etc/skel/.config/hypr/hyprland.lua ]] && rm -f /etc/skel/.config/hypr/hyprland.conf + set_hypr_keyboard /etc/skel/.config/hypr/hyprland.lua fi # DankMaterialShell (DMS) felhasználói konfig @@ -151,6 +166,7 @@ while IFS=: read -r user _ uid gid _ home shell; do cp -rf "${PAYLOAD}/hypr/." "${home}/.config/hypr/" [[ -f "${home}/.config/hypr/hyprland.lua" ]] && \ rm -f "${home}/.config/hypr/hyprland.conf" + set_hypr_keyboard "${home}/.config/hypr/hyprland.lua" fi # hyprpaper konfig (háttérkép daemon) |