From 3c75f5acc80acfbf3c749d08b2a2000a3b847c10 Mon Sep 17 00:00:00 2001
From: Benson Chu <bensonchu457@gmail.com>
Date: Thu, 22 Aug 2024 18:52:49 -0500
Subject: [PATCH] Upgrading to 24.05

---
 common/laptop-things.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/laptop-things.nix b/common/laptop-things.nix
index d280105..c87604c 100644
--- a/common/laptop-things.nix
+++ b/common/laptop-things.nix
@@ -15,9 +15,11 @@
 
   # Configure keymap in X11
   services.xserver = {
-    layout = lib.mkForce "us,us";
-    xkbVariant = lib.mkForce "dvorak,";
-    xkbOptions = "grp:win_space_toggle";
+    xkb = {
+      layout = lib.mkForce "us,us";
+      variant = lib.mkForce "dvorak,";
+      options = "grp:win_space_toggle";
+    };
   };
 
   # Configure console keymap