Merge upstream quattro: installer input methods (#237) and OPR priority (#240)

This commit is contained in:
ZacharyZhang-NY committed 2026-10-08 23:50:48 -04:00
commit abe2d6a1b4
14 files changed
+232 -32

No files matched your search

+6
View File
@@ -904,6 +904,8 @@ run_partition_execute() {
"bootloader_config": { "bootloader": "Limine", "uki": false, "removable": false },
"custom_commands": [],
"omarchy_install": {
"input_method": "${keyboard_input_method:-none}",
"input_xkb_layout": "${keyboard_xkb_layout:-}",
"mode": "protected",
"region": "$region",
"target_mount": "/mnt",
@@ -1167,6 +1169,8 @@ if $defer_provisioning; then
# their real layout in the OOBE, which re-keys the console and, on encrypted
# installs, rebuilds the initramfs so the LUKS prompt matches.
keyboard="us"
keyboard_input_method="none"
keyboard_xkb_layout=""
username=""
password=""
password_hash=""
@@ -1249,6 +1253,8 @@ cat <<-_EOF_ >user_configuration.json
"bootloader_config": { "bootloader": "Limine", "uki": false, "removable": false },
"custom_commands": [],
"omarchy_install": {
"input_method": "${keyboard_input_method:-none}",
"input_xkb_layout": "${keyboard_xkb_layout:-}",
"mode": "full_disk",
"region": "$region",
"defer_provisioning": $defer_provisioning,