From 9b6501132170f3f18d4a7e5b5f044762b8c8a8bf Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 20 Oct 2023 00:36:48 +0100
Subject: [PATCH] nixos/xserver: move keyboard layout settings

---
 nixos/desktop/locale.nix  | 8 --------
 nixos/desktop/xserver.nix | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/nixos/desktop/locale.nix b/nixos/desktop/locale.nix
index 3af658e0..710524e5 100644
--- a/nixos/desktop/locale.nix
+++ b/nixos/desktop/locale.nix
@@ -14,14 +14,6 @@
       };
     };
 
-    # Set X11 keyboard layout.
-    services.xserver = {
-      layout = lib.mkDefault "us";
-      xkbVariant = lib.mkDefault "intl";
-      # Remap Caps Lock to Esc, and use Super+Space to change layouts
-      xkbOptions = lib.mkDefault "caps:escape,grp:win_space_toggle";
-    };
-
     # Set your time zone.
     time.timeZone = lib.mkDefault "America/Sao_Paulo";
   };
diff --git a/nixos/desktop/xserver.nix b/nixos/desktop/xserver.nix
index 514784c7..67b5c94a 100644
--- a/nixos/desktop/xserver.nix
+++ b/nixos/desktop/xserver.nix
@@ -36,6 +36,13 @@
             accelProfile = "flat";
           };
         };
+
+        # X11 keyboard layout
+        layout = lib.mkDefault "us";
+        xkbVariant = lib.mkDefault "intl";
+        # Remap Caps Lock to Esc, and use Super+Space to change layouts
+        xkbOptions = lib.mkDefault "caps:escape,grp:win_space_toggle";
+
       };
     };