always import hosts/common/desktop + fix gnome/plasma

1 files changed, 19 insertions, 17 deletions

diff --git a/hosts/common/desktop/plasma.nix b/hosts/common/desktop/plasma.nix
index f06fe23..952684f 100644
--- a/hosts/common/desktop/plasma.nix
+++ b/hosts/common/desktop/plasma.nix
@@ -2,21 +2,23 @@
 	config,
 	pkgs,
 	...
-}:
-if config.sys.desktop == "plasma"
-then {
-	services.xserver = {
-		displayManager.sddm.enable = true;
-		desktopManager.plasma5 = {
-			enable = true;
-			excludePackages = with pkgs.libsForQt5; [
-				elisa
-				khelpcenter
-				oxygen
-				plasma-browser-integration
-				print-manager
-			];
-		};
-	};
+}: let
+	xserverConfig =
+		if config.sys.desktop == "plasma"
+		then {
+			displayManager.sddm.enable = true;
+			desktopManager.plasma5 = {
+				enable = true;
+				excludePackages = with pkgs.libsForQt5; [
+					elisa
+					khelpcenter
+					oxygen
+					plasma-browser-integration
+					print-manager
+				];
+			};
+		}
+		else {};
+in {
+	services.xserver = xserverConfig;
 }
-else {}