nixos/xserver: move keyboard layout settings

thiagokokada · Oct 19, 2023 · 9b65011 · 9b65011
1 parent 8d148fe
commit 9b65011
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -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";
+
       };
     };