3 files changed, 41 insertions, 55 deletions
diff --git a/hosts/common/desktop/default.nix b/hosts/common/desktop/default.nix
index d6d42a6..3f6aba7 100644
--- a/hosts/common/desktop/default.nix
+++ b/hosts/common/desktop/default.nix
@@ -1,14 +1,22 @@
 {
-	config,
 	lib,
+	desktop,
 	...
 }: let
-	gui = config.sys.gui.enable;
+	gui = desktop != "";
 in {
-	imports = [
-		./gnome.nix
-		./plasma.nix
-	];
+	imports =
+		[]
+		++ (
+			if (desktop == "gnome")
+			then [./gnome.nix]
+			else []
+		)
+		++ (
+			if (desktop == "plasma")
+			then [./plasma.nix]
+			else []
+		);
 
 	environment.noXlibs = lib.mkForce false;
 	programs.xwayland.enable = gui;
diff --git a/hosts/common/desktop/gnome.nix b/hosts/common/desktop/gnome.nix
index af4a0d0..e3f8b21 100644
--- a/hosts/common/desktop/gnome.nix
+++ b/hosts/common/desktop/gnome.nix
@@ -1,30 +1,17 @@
-{
-	config,
-	pkgs,
-	...
-}: let
-	environmentConfig =
-		if config.sys.desktop == "gnome"
-		then {
-			gnome.excludePackages = with pkgs; [
-				epiphany
-				gnome-tour
-			];
-			systemPackages = with pkgs; [
-				adw-gtk3
-				blackbox-terminal
-			];
-		}
-		else {};
+{pkgs, ...}: {
+	environment = {
+		gnome.excludePackages = with pkgs; [
+			epiphany
+			gnome-tour
+		];
+		systemPackages = with pkgs; [
+			adw-gtk3
+			blackbox-terminal
+		];
+	};
 
-	xserverConfig =
-		if config.sys.desktop == "gnome"
-		then {
-			displayManager.gdm.enable = true;
-			desktopManager.gnome.enable = true;
-		}
-		else {};
-in {
-	environment = environmentConfig;
-	services.xserver = xserverConfig;
+	services.xserver = {
+		displayManager.gdm.enable = true;
+		desktopManager.gnome.enable = true;
+	};
 }
diff --git a/hosts/common/desktop/plasma.nix b/hosts/common/desktop/plasma.nix
index 98eee0b..80514fd 100644
--- a/hosts/common/desktop/plasma.nix
+++ b/hosts/common/desktop/plasma.nix
@@ -1,22 +1,13 @@
-{
-	config,
-	pkgs,
-	...
-}: let
-	xserverConfig =
-		if config.sys.desktop == "plasma"
-		then {
-			displayManager.sddm.enable = true;
-			desktopManager.plasma5 = {
-				enable = true;
-				excludePackages = with pkgs.libsForQt5; [
-					khelpcenter
-					plasma-browser-integration
-					print-manager
-				];
-			};
-		}
-		else {};
-in {
-	services.xserver = xserverConfig;
+{pkgs, ...}: {
+	services.xserver = {
+		displayManager.sddm.enable = true;
+		desktopManager.plasma5 = {
+			enable = true;
+			excludePackages = with pkgs.libsForQt5; [
+				khelpcenter
+				plasma-browser-integration
+				print-manager
+			];
+		};
+	};
 }