diff --git a/system/gui/default.nix b/system/gui/default.nix
index 0d36ae7..0830564 100644
--- a/system/gui/default.nix
+++ b/system/gui/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ./x11.nix
     ./fonts.nix
   ];
 }
diff --git a/system/gui/dwm.nix b/system/gui/dwm.nix
index ec15145..411cf1e 100644
--- a/system/gui/dwm.nix
+++ b/system/gui/dwm.nix
@@ -4,6 +4,7 @@
   imports = [
     ./default.nix
     ./lightdm.nix
+    ./x11.nix
   ];
 
   services.xserver.windowManager.dwm.enable = true;
diff --git a/system/gui/gnome.nix b/system/gui/gnome.nix
index 97acc6d..6b278f1 100644
--- a/system/gui/gnome.nix
+++ b/system/gui/gnome.nix
@@ -1,10 +1,14 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, userSettings, ... }:
 
 {
   imports = [
     ./default.nix
+    (if userSettings.desktopType == "x11" then ./x11.nix else "")
   ];
 
-  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.displayManager.gdm = {
+    enable = true;
+    wayland = (if userSettings.desktopType == "x11" then false else true);
+  };
   services.xserver.desktopManager.gnome.enable = true;
 }