From f6ddb5a96ddacba4b5ea71c942b6024d19861774 Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Mon, 22 Jun 2020 14:00:55 +0100
Subject: [PATCH] Change back to US and US-intl (most consistent)

---
 roles/debian/files/keyboard | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/debian/files/keyboard b/roles/debian/files/keyboard
index da8a6a3..b7fe06a 100644
--- a/roles/debian/files/keyboard
+++ b/roles/debian/files/keyboard
@@ -3,9 +3,9 @@
 # Consult the keyboard(5) manual page.
 # Update the initramfs after changing this file.
 
-XKBMODEL="pc105"
-XKBLAYOUT="us,ca"
-XKBVARIANT=",multi"
-XKBOPTIONS="compose:menu,grp:alt_caps_toggle"
+XKBMODEL="pc104"
+XKBLAYOUT="us,us"
+XKBVARIANT=",intl"
+XKBOPTIONS="compose:menu,grp:alt_caps_toggle,nbsp:level3"
 
 BACKSPACE="guess"