From 540b47dc3c0264a9e38897c7fc9c38c257e518d2 Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Fri, 17 Jul 2020 16:56:22 +0200
Subject: [PATCH] Changed Xorg config of keyboard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Several layouts changed with the Menu key was too much of a pain in
the back, so the only default layout now is the bépo layout
---
 .config/yadm/bootstrap      | 6 +++---
 org/config/installation.org | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 75f8195..3ca0e53 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -7,10 +7,10 @@ set keyboardconf \
 'Section "InputClass"
         Identifier "system-keyboard"
         MatchIsKeyboard "on"
-        Option "XkbLayout" "fr,fr,us"
+        Option "XkbLayout" "fr"
         Option "XkbModel" "pc104"
-        Option "XkbVariant" "bepo_afnor,,"
-        Option "XkbOptions" "grp:menu_toggle,caps:ctrl_modifier"
+        Option "XkbVariant" "bepo_afnor"
+        Option "XkbOptions" "caps:ctrl_modifier"
 EndSection'
 
 printf "\n# Set keyboard layout #########################################################\n\n"
diff --git a/org/config/installation.org b/org/config/installation.org
index 9697062..124b060 100644
--- a/org/config/installation.org
+++ b/org/config/installation.org
@@ -179,10 +179,10 @@
      'Section "InputClass"
              Identifier "system-keyboard"
              MatchIsKeyboard "on"
-             Option "XkbLayout" "fr,fr,us"
+             Option "XkbLayout" "fr"
              Option "XkbModel" "pc104"
-             Option "XkbVariant" "bepo_afnor,,"
-             Option "XkbOptions" "grp:menu_toggle,caps:ctrl_modifier"
+             Option "XkbVariant" "bepo_afnor"
+             Option "XkbOptions" "caps:ctrl_modifier"
      EndSection'
    #+END_SRC
    So, let’s set it as our keyboard configuration.