3 files changed, 22 insertions, 21 deletions
diff --git a/hosts/common/desktop/common.nix b/hosts/common/desktop/common.nix
deleted file mode 100644
index d0289b1..0000000
--- a/hosts/common/desktop/common.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{config, ...}: {
-	programs.xwayland.enable = true;
-	xdg.portal.enable = true;
-}
diff --git a/hosts/common/desktop/default.nix b/hosts/common/desktop/default.nix
new file mode 100644
index 0000000..d5cc99f
--- /dev/null
+++ b/hosts/common/desktop/default.nix
@@ -0,0 +1,9 @@
+{
+	config,
+	lib,
+	...
+}: {
+	programs.xwayland.enable = true;
+	xdg.portal.enable = true;
+	environment.noXlibs = lib.mkForce false;
+}
diff --git a/hosts/common/desktop/gnome.nix b/hosts/common/desktop/gnome.nix
index f6d06b4..76e02cb 100644
--- a/hosts/common/desktop/gnome.nix
+++ b/hosts/common/desktop/gnome.nix
@@ -3,22 +3,18 @@
 	pkgs,
 	...
 }: {
-	services =
-		if config.system.gui-stuff
-		then {
-			xserver.enable = true;
-			xserver.displayManager.gdm.enable = true;
-			xserver.desktopManager.gnome.enable = true;
-		}
-		else {};
+	imports = [
+		./.
+	];
 
-	environment.gnome.excludePackages = (
-		with pkgs;
-			if config.system.gui-stuff
-			then [
-				epiphany
-				gnome-tour
-			]
-			else []
-	);
+	services.xserver = {
+		enable = true;
+		displayManager.gdm.enable = true;
+		desktopManager.gnome.enable = true;
+	};
+
+	environment.gnome.excludePackages = with pkgs; [
+		epiphany
+		gnome-tour
+	];
 }