From 436863e523b9e54b7817960478a24bb80d853c44 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Sat, 24 Sep 2022 12:09:25 +0200
Subject: [PATCH] Add switch to x11 layout

---
 odin/common_configuration.nix | 10 ++--------
 odin/hm.nix                   |  4 ++--
 thor/configuration.nix        |  5 +++--
 thor/hm.nix                   |  4 ++--
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/odin/common_configuration.nix b/odin/common_configuration.nix
index ba9dde4..ac22310 100644
--- a/odin/common_configuration.nix
+++ b/odin/common_configuration.nix
@@ -82,14 +82,8 @@ with lib; {
     };
 
     # Configure keymap in X11
-    layout = "it";
-    extraLayouts = {
-      eng = {
-        languages = [ "eng" ];
-        description = "English layout for external keyboard";
-      };
-    };
-    xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl";
+    layout = "it,us";
+    xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle";
     libinput.enable = true;
   };
 
diff --git a/odin/hm.nix b/odin/hm.nix
index b25a1cd..50b6f19 100644
--- a/odin/hm.nix
+++ b/odin/hm.nix
@@ -2,8 +2,8 @@
   home = {
     language.base = "it_IT.UTF-8";
     keyboard = {
-      layout = "it";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
+      layout = "it,us";
+      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
     };
     packages = with pkgs; [
       pulseaudio
diff --git a/thor/configuration.nix b/thor/configuration.nix
index 6a856af..a9c251b 100644
--- a/thor/configuration.nix
+++ b/thor/configuration.nix
@@ -153,9 +153,10 @@ with lib; {
         theme =
           "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance";
       };
-      layout = "us";
+
       videoDrivers = [ "nvidia" ];
-      xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl";
+      layout = "us,it";
+      xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle";
       xrandrHeads = [{
         primary = true;
         output = "DP-4";
diff --git a/thor/hm.nix b/thor/hm.nix
index 0e25343..6596cae 100644
--- a/thor/hm.nix
+++ b/thor/hm.nix
@@ -2,8 +2,8 @@
   home = {
     language.base = "it_IT.UTF-8";
     keyboard = {
-      layout = "en";
-      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" ];
+      layout = "us,it";
+      options = [ "terminate:ctrl_alt_bksp" "compose:rctrl" "grp:menu_toggle" ];
     };
     packages = with pkgs; [
       pulseaudio