diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 4a14e66..838b570 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -57,15 +57,6 @@
   programs.dconf.enable = true;
 
   # Configure keymap in X11
-  services.xserver = {
-    xkb.layout = "us";
-    xkb.variant = "";
-  };
-
-  xdg.portal = {
-    enable = true;
-    #extraPortals = [pkgs.xdg-desktop-portal-gtk];
-  };
 
   # Enable CUPS to print documents.
   services.printing.enable = true;
diff --git a/modules/nixos/display-manager/default.nix b/modules/nixos/display-manager/default.nix
index 1a2660b..554f5ec 100644
--- a/modules/nixos/display-manager/default.nix
+++ b/modules/nixos/display-manager/default.nix
@@ -18,10 +18,14 @@
           plasma6.enable = true;
           gnome.enable = false;
         };
+        xkb = {
+          layout = "us";
+          variant = "";
+        };
       };
       wayland.enable = true;
     };
-
+    xdg.portal.enable = true;
     programs.xwayland.enable = true;
   };
 }