Offene Werkstatt-Issues umsetzen

live/intake-login.sh

@@ -4,6 +4,19 @@
 [[ -z "${WAYLAND_DISPLAY:-}" ]] || return 0
 export WLR_RENDERER_ALLOW_SOFTWARE=1
 export XDG_SESSION_TYPE=wayland
+keyboard_layout=$(python3 - /mnt/intake-data/config/workshop.json <<'PY'
+import json
+import pathlib
+import sys
+
+try:
+    value = json.loads(pathlib.Path(sys.argv[1]).read_text()).get('keyboard_layout', 'de')
+except (OSError, ValueError):
+    value = 'de'
+print(value if value in ('de', 'us') else 'de')
+PY
+)
+export XKB_DEFAULT_LAYOUT="$keyboard_layout"
 if [[ ! -w /mnt/intake-data ]]; then
   printf '\nCS-R Intake: data partition not writable; no scan can be saved.\n' >&2
   printf 'Press Enter for diagnostic console...'