diff --git a/common/default.nix b/common/default.nix
index b4797643..0216fb0b 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -52,9 +52,9 @@
   services = {
     fwupd.enable = true;
 
-    xserver = {
+    xserver.xkb = {
       layout = "ca";
-      xkbVariant = "multix";
+      variant = "multix";
     };
   };
 
diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index edce4c44..6fdeddc5 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -89,10 +89,10 @@ in {
         ];
 
         input = let
-          inherit (config.services) xserver;
+          inherit (config.services.xserver) xkb;
         in {
-          kb_layout = xserver.layout;
-          kb_variant = xserver.xkbVariant;
+          kb_layout = xkb.layout;
+          kb_variant = xkb.variant;
           follow_mouse = true;
 
           touchpad = {
diff --git a/modules/kmscon.nix b/modules/kmscon.nix
index f458906f..b1fd1386 100644
--- a/modules/kmscon.nix
+++ b/modules/kmscon.nix
@@ -1,4 +1,6 @@
-{config, ...}: {
+{config, ...}: let
+  inherit (config.services.xserver) xkb;
+in {
   services.kmscon = {
     enable = true;
     hwRender = false;
@@ -6,8 +8,8 @@
     extraOptions = builtins.concatStringsSep " " [
       "--font-size 12.5"
       "--font-dpi 170"
-      "--xkb-layout ${config.services.xserver.layout}"
-      "--xkb-variant ${config.services.xserver.xkbVariant}"
+      "--xkb-layout ${xkb.layout}"
+      "--xkb-variant ${xkb.variant}"
       "--font-name 'JetBrainsMono Nerd Font'"
     ];
   };