diff --git a/hosts/common.nix b/hosts/common.nix
index b62b49e7..de6757c6 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -157,10 +157,17 @@
     };
   };
 
-  services.tailscale = {
-    enable = true;
-    openFirewall = true;
-    authKeyFile = config.age.secrets.tailscaleAuthKey.path;
+  services = {
+    tailscale = {
+      enable = true;
+      openFirewall = true;
+      authKeyFile = config.age.secrets.tailscaleAuthKey.path;
+    };
+
+    xserver.xkb = {
+      layout = "us";
+      variant = "altgr-intl";
+    };
   };
 
   system.autoUpgrade = {
diff --git a/nixosModules/desktop/default.nix b/nixosModules/desktop/default.nix
index dc7d06b2..62c0e9ac 100644
--- a/nixosModules/desktop/default.nix
+++ b/nixosModules/desktop/default.nix
@@ -54,12 +54,6 @@
 
         xserver = {
           enable = true;
-
-          xkb = {
-            layout = "us";
-            variant = "altgr-intl";
-          };
-
           excludePackages = with pkgs; [xterm];
         };
       };