From 2b2b364a676b0d5c1a4d2652d5ab234c1cab6ab4 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Tue, 12 Mar 2024 07:48:11 -0600
Subject: [PATCH] gui/kde: fix setting of sddm

---
 gui/kde.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/gui/kde.nix b/gui/kde.nix
index 5f4b242..6f1ec45 100644
--- a/gui/kde.nix
+++ b/gui/kde.nix
@@ -8,15 +8,18 @@
 
   config = lib.mkIf config.kde.enable {
     services.xserver =
-      if isUnstable then {
-        desktopManager.plasma6.enable = true;
-        displayManager.sddm.wayland.enable = true;
-      }
-      else {
-        desktopManager.plasma5.enable = true;
-      } // {
-        displayManager.sddm.enable = true;
-      };
+      lib.mkMerge [
+        (if isUnstable then {
+          desktopManager.plasma6.enable = true;
+          displayManager.sddm.wayland.enable = true;
+        }
+        else {
+          desktopManager.plasma5.enable = true;
+        })
+        ({
+          displayManager.sddm.enable = true;
+        })
+      ];
 
     # Listen for KDE Connect connections on the tailnet
     networking.firewall.interfaces = {