From fb7566bc65661bdf6151c79bf0b92939631c0127 Mon Sep 17 00:00:00 2001 From: dyl-joseph Date: Sat, 12 Sep 2026 00:01:05 -0500 Subject: [PATCH 1/4] test(guest): expect us-acentos keyboard backport Red commit for issue #194. Requires the keyboard-us-acentos backport. Fails until the patch lands. --- guest/tests/verify.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/guest/tests/verify.py b/guest/tests/verify.py index cfac91747..910140cfe 100755 --- a/guest/tests/verify.py +++ b/guest/tests/verify.py @@ -247,6 +247,7 @@ def main() -> None: "geforce-now-aarch64-unavailable", "battlenet-aarch64-unavailable", "lutris-aarch64-unavailable", + "keyboard-us-acentos", ], "Omarchy backports are explicitly ordered and identified", ) @@ -291,6 +292,12 @@ def main() -> None: "exec omarchy-pkg-unavailable-arm Lutris" in lutris_unavailable_patch, "Lutris aarch64 backport fails via the shared unavailable helper", ) + keyboard_patch = read(GUEST / "patches/omarchy/keyboard-us-acentos.patch") + check( + "us-acentos" in keyboard_patch + and "English (US, intl. with dead keys)" in keyboard_patch, + "keyboard backport adds the US intl with dead keys layout", + ) dropbox_unavailable_patch = read(GUEST / "patches/omarchy/dropbox-aarch64-unavailable.patch") check( "exec omarchy-pkg-unavailable-arm Dropbox" in dropbox_unavailable_patch From 05661192b92fa468450fdfec6a29f5ed91588ced Mon Sep 17 00:00:00 2001 From: dyl-joseph Date: Sat, 12 Sep 2026 00:01:06 -0500 Subject: [PATCH 2/4] fix(guest): add us-acentos keyboard layout option Add English (US, intl. with dead keys)|us-acentos to OMARCHY_KEYBOARD_LAYOUTS via backport. Console keymap maps to XKB us/intl through systemd kbd-model-map. No change to apply_keyboard or input.lua. Fixes #194. --- guest/patches/omarchy/keyboard-us-acentos.patch | 11 +++++++++++ guest/spec.json | 14 ++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 guest/patches/omarchy/keyboard-us-acentos.patch diff --git a/guest/patches/omarchy/keyboard-us-acentos.patch b/guest/patches/omarchy/keyboard-us-acentos.patch new file mode 100644 index 000000000..cf7536c52 --- /dev/null +++ b/guest/patches/omarchy/keyboard-us-acentos.patch @@ -0,0 +1,11 @@ +diff --git a/install/provisioning/setup-form.sh b/install/provisioning/setup-form.sh +--- a/install/provisioning/setup-form.sh ++++ b/install/provisioning/setup-form.sh +@@ -33,6 +33,7 @@ OMARCHY_KEYBOARD_LAYOUTS=$'English (US)|us + English (UK)|uk + English (US, Dvorak)|dvorak + English (US, Colemak)|colemak ++English (US, intl. with dead keys)|us-acentos + Azerbaijani|azerty + Belarusian|by + Belgian|be-latin1 diff --git a/guest/spec.json b/guest/spec.json index b71ac26b4..5318ad115 100644 --- a/guest/spec.json +++ b/guest/spec.json @@ -453,6 +453,20 @@ "afterSha256": "22062e6fc14f8405d3da23f2edc892fc22dcaf51ed4c944ee5d7c0fc3b0992bd" } ] + }, + { + "id": "keyboard-us-acentos", + "description": "Add US intl with dead keys keyboard option for ANSI hardware used to write Portuguese.", + "reference": "https://github.com/omacom/try-omarchy/issues/194", + "patch": "patches/omarchy/keyboard-us-acentos.patch", + "patchSha256": "647d32947b57e363e04b255cb97dbb931973cc09af1a8257b71ea87f9bec18bb", + "targets": [ + { + "path": "install/provisioning/setup-form.sh", + "beforeSha256": "0fbb8c3c8b151e5ff884c16d381e12fda53cc16adfd08a684d41e7327250665d", + "afterSha256": "cfc63b9d007e2fc1619f95d8c52699741df1099c447a5af66f3a58b62a0de36a" + } + ] } ], "postBuildUserInstallers": [ From f16f057bea18fb860667a3d4af3e30aa4d23e5cc Mon Sep 17 00:00:00 2001 From: dyl-joseph Date: Sat, 12 Sep 2026 00:51:48 -0500 Subject: [PATCH 3/4] chore(guest): refresh ARM64 package lock Resolve the spec transaction against current repos. 16 version bumps plus new numactl 2.0.19-1. Matches the drift reported by the guest build. --- guest/packages.lock.json | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/guest/packages.lock.json b/guest/packages.lock.json index 0f1eec7a8..200367ac5 100644 --- a/guest/packages.lock.json +++ b/guest/packages.lock.json @@ -77,8 +77,8 @@ "freeglut": "3.8.0-1", "freetype2": "2.14.3-1", "fribidi": "1.0.16-2", - "fuse-common": "3.18.2-1", - "fuse3": "3.18.2-1", + "fuse-common": "3.18.3-1", + "fuse3": "3.18.3-1", "fzf": "0.74.3-1", "gawk": "5.4.1-1", "gc": "8.2.12-1", @@ -125,11 +125,11 @@ "gst-plugins-base-libs": "1.28.7-1", "gstreamer": "1.28.7-1", "gtest": "1.18.0-1", - "gtk-update-icon-cache": "1:4.22.4-1", + "gtk-update-icon-cache": "1:4.22.5-1", "gtk3": "1:3.24.52-1", - "gtk4": "1:4.22.4-1", + "gtk4": "1:4.22.5-1", "guile": "3.0.11-1", - "gum": "2.0.0-1", + "gum": "2.0.1-1", "gupnp": "1:1.6.10-1", "gupnp-dlna": "0.12.0-5", "gupnp-igd": "1.6.0-2", @@ -208,7 +208,7 @@ "libbsd": "0.12.2-2", "libbytesize": "2.12-3", "libcap": "2.78-1", - "libcap-ng": "0.9.5-1", + "libcap-ng": "0.9.6-1", "libcdio": "2.4.0-1", "libcdio-paranoia": "10.2+2.0.2-3", "libcgif": "0.5.4-1", @@ -398,8 +398,8 @@ "libzip": "1.11.4-1", "licenses": "20240728-1", "lilv": "0.28.0-1", - "linux-aarch64": "7.2.3-2", - "linux-aarch64-headers": "7.2.3-2", + "linux-aarch64": "7.2.4-1", + "linux-aarch64-headers": "7.2.4-1", "linux-api-headers": "7.2-1", "llhttp": "9.3.1-1", "llvm-libs": "22.1.8-2", @@ -440,6 +440,7 @@ "npth": "1.8-1", "nspr": "4.40-1", "nss": "3.128-1", + "numactl": "2.0.19-1", "ocl-icd": "2.3.5-1", "omarchy-keyring": "20251027-1", "onetbb": "2023.1.0-1", @@ -453,7 +454,7 @@ "openssh": "10.5p1-1", "openssl": "3.6.4-1", "opus": "1.6.1-1", - "orc": "0.4.43-1", + "orc": "0.4.44-1", "osinfo-db": "20260812-1", "p11-kit": "0.26.5-1", "pacman": "7.1.0.r9.g54d9411-2", @@ -530,10 +531,10 @@ "srt": "1.5.7-1", "starship": "1.26.0-1", "sudo": "1.9.17.p2-6", - "systemd": "261.2-1", - "systemd-libs": "261.2-1", - "systemd-resolvconf": "261.2-1", - "systemd-sysvcompat": "261.2-1", + "systemd": "261.3-1", + "systemd-libs": "261.3-1", + "systemd-resolvconf": "261.3-1", + "systemd-sysvcompat": "261.3-1", "tar": "1.35-5", "tinysparql": "3.11.1-1", "tmux": "3.7_c-1", @@ -605,8 +606,8 @@ "xorgproto": "2025.1-1", "xvidcore": "1.3.7-4", "xxhash": "0.8.3-1", - "xz": "5.8.3-1", - "yyjson": "0.12.0-1", + "xz": "5.8.4-1", + "yyjson": "0.13.0-1", "zeromq": "4.3.5-3", "zimg": "3.0.6-2", "zix": "0.8.2-1", From 9ae872042e68737cd1847f0f7bebf3af18a7f9b4 Mon Sep 17 00:00:00 2001 From: Eduardo Date: Mon, 21 Sep 2026 21:52:51 +0900 Subject: [PATCH 4/4] Clarify keyboard layout choices --- guest/patches/omarchy/keyboard-us-acentos.patch | 13 +++++++++++-- guest/spec.json | 6 +++--- guest/tests/verify.py | 6 +++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/guest/patches/omarchy/keyboard-us-acentos.patch b/guest/patches/omarchy/keyboard-us-acentos.patch index cf7536c52..611ad08d0 100644 --- a/guest/patches/omarchy/keyboard-us-acentos.patch +++ b/guest/patches/omarchy/keyboard-us-acentos.patch @@ -1,11 +1,20 @@ diff --git a/install/provisioning/setup-form.sh b/install/provisioning/setup-form.sh --- a/install/provisioning/setup-form.sh +++ b/install/provisioning/setup-form.sh -@@ -33,6 +33,7 @@ OMARCHY_KEYBOARD_LAYOUTS=$'English (US)|us +@@ -33,6 +33,7 @@ English (UK)|uk English (US, Dvorak)|dvorak English (US, Colemak)|colemak -+English (US, intl. with dead keys)|us-acentos ++English (US, International with dead keys)|us-acentos Azerbaijani|azerty Belarusian|by Belgian|be-latin1 +@@ -65,7 +66,7 @@ + Norwegian|no-latin1 + Polish|pl + Portuguese|pt-latin1 +-Portuguese (Brazil)|br-abnt2 ++Portuguese (Brazil, ABNT2)|br-abnt2 + Romanian|ro + Russian|ru + Serbian|sr-latin diff --git a/guest/spec.json b/guest/spec.json index b0dc10cb3..d33ac21f8 100644 --- a/guest/spec.json +++ b/guest/spec.json @@ -466,15 +466,15 @@ }, { "id": "keyboard-us-acentos", - "description": "Add US intl with dead keys keyboard option for ANSI hardware used to write Portuguese.", + "description": "Add US International with dead keys and distinguish the Brazilian ABNT2 keyboard option.", "reference": "https://github.com/omacom/try-omarchy/issues/194", "patch": "patches/omarchy/keyboard-us-acentos.patch", - "patchSha256": "647d32947b57e363e04b255cb97dbb931973cc09af1a8257b71ea87f9bec18bb", + "patchSha256": "e81e1bd6b23816ecc2d2360b446e29c27947314d3cc5b3181d38982b8c16ec0d", "targets": [ { "path": "install/provisioning/setup-form.sh", "beforeSha256": "0fbb8c3c8b151e5ff884c16d381e12fda53cc16adfd08a684d41e7327250665d", - "afterSha256": "cfc63b9d007e2fc1619f95d8c52699741df1099c447a5af66f3a58b62a0de36a" + "afterSha256": "5e2288809a3d9cc2cf91ca955be97b5fdcf6e786b7e8e3be6ea1a1b19abda15c" } ] } diff --git a/guest/tests/verify.py b/guest/tests/verify.py index 724078a64..f4c1a4873 100755 --- a/guest/tests/verify.py +++ b/guest/tests/verify.py @@ -294,9 +294,9 @@ def main() -> None: ) keyboard_patch = read(GUEST / "patches/omarchy/keyboard-us-acentos.patch") check( - "us-acentos" in keyboard_patch - and "English (US, intl. with dead keys)" in keyboard_patch, - "keyboard backport adds the US intl with dead keys layout", + "+English (US, International with dead keys)|us-acentos" in keyboard_patch + and "+Portuguese (Brazil, ABNT2)|br-abnt2" in keyboard_patch, + "keyboard backport distinguishes US International from Brazilian ABNT2", ) dropbox_unavailable_patch = read(GUEST / "patches/omarchy/dropbox-aarch64-unavailable.patch") check(