diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index e592fbf..7431a12 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -34,13 +34,16 @@ in {
           if config.my.gui.isNvidia
           then ["nvidia"]
           else options.services.xserver.videoDrivers.default;
-        layout = "fr";
-        xkbVariant = "us";
-        libinput = {
-          enable = true;
-          touchpad = {
-            naturalScrolling = true;
-          };
+        xkb = {
+          layout = "fr";
+          variant = "us";
+        };
+      };
+
+      libinput = {
+        enable = true;
+        touchpad = {
+          naturalScrolling = true;
         };
       };