From 60e0dbf4b3725c22fd49ef7d27f93a36f9283390 Mon Sep 17 00:00:00 2001 From: nippy Date: Thu, 13 Aug 2026 17:42:28 +0200 Subject: fix calamares --- raveos-gnome-theme/PKGBUILD | 2 +- raveos-gnome-theme/raveos-gnome-apply.sh | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'raveos-gnome-theme') diff --git a/raveos-gnome-theme/PKGBUILD b/raveos-gnome-theme/PKGBUILD index 94fbe37..6bed779 100644 --- a/raveos-gnome-theme/PKGBUILD +++ b/raveos-gnome-theme/PKGBUILD @@ -15,7 +15,7 @@ pkgname=raveos-gnome-theme pkgver=0.0.0 -pkgrel=28 +pkgrel=29 pkgdesc="RaveOS GNOME theme payload and installer" arch=('any') url="https://raveos.local" diff --git a/raveos-gnome-theme/raveos-gnome-apply.sh b/raveos-gnome-theme/raveos-gnome-apply.sh index c89aacb..324e988 100755 --- a/raveos-gnome-theme/raveos-gnome-apply.sh +++ b/raveos-gnome-theme/raveos-gnome-apply.sh @@ -158,6 +158,16 @@ install_user() { build_user_dconf_dump "${target_home}" "${tmpdir}/full-system-dump.ini" chmod 644 "${tmpdir}/full-system-dump.ini" + # A Calamares keyboard modul altal beallitott kiosztas kiolvasasa + # (a rendszerszintu konfig /etc/default/keyboard-ba kerult, de a GNOME + # Wayland a sajat org.gnome.desktop.input-sources-t hasznalja). + local kb_layout="hu" + if [[ -f /etc/default/keyboard ]]; then + local kb_tmp + kb_tmp="$(awk -F'"' '/^XKBLAYOUT=/{print $2; exit}' /etc/default/keyboard 2>/dev/null)" + [[ -n "$kb_tmp" ]] && kb_layout="${kb_tmp%%,*}" + fi + if command -v dconf &>/dev/null && command -v dbus-run-session &>/dev/null; then runuser -u "$target_user" -- env \ HOME="${target_home}" USER="${target_user}" LOGNAME="${target_user}" \ @@ -170,6 +180,7 @@ install_user() { gsettings set org.gnome.desktop.background picture-uri 'file://${target_home}/.config/background' || true gsettings set org.gnome.desktop.background picture-uri-dark 'file://${target_home}/.config/background' || true gsettings set org.gnome.shell.extensions.user-theme name 'Yaru-olive-dark' || true + gsettings set org.gnome.desktop.input-sources sources \"[('xkb', '${kb_layout}')]\" || true " /dev/null 2>&1 || true fi -- cgit v1.3