From d71bfa4537fd7c5d914f8a33d02a9b77235231d5 Mon Sep 17 00:00:00 2001
From: Thomas Syms <thomassyms@gmail.com>
Date: Sun, 14 Apr 2024 14:47:30 -0300
Subject: [PATCH] Updated definitions for kde6 to default kde

---
 hosts/Equinox/default.nix |  2 +-
 hosts/Pegasus/default.nix |  2 +-
 modules/gnome.nix         |  1 -
 modules/kde.nix           | 23 ++++++++++++++++++-----
 modules/kde6.nix          |  9 ---------
 5 files changed, 20 insertions(+), 17 deletions(-)
 delete mode 100644 modules/kde6.nix

diff --git a/hosts/Equinox/default.nix b/hosts/Equinox/default.nix
index 59630c0..6a0b6f5 100644
--- a/hosts/Equinox/default.nix
+++ b/hosts/Equinox/default.nix
@@ -22,7 +22,7 @@ in {
     ../../modules/containers-nvidia.nix
     ../../modules/virtualization.nix
     ../../modules/harden.nix
-    ../../modules/kde6.nix
+    ../../modules/kde.nix
   ];
 
   # Set networking
diff --git a/hosts/Pegasus/default.nix b/hosts/Pegasus/default.nix
index d4b753c..4d8f53a 100644
--- a/hosts/Pegasus/default.nix
+++ b/hosts/Pegasus/default.nix
@@ -12,7 +12,7 @@ in {
     ../../modules/containers.nix
     ../../modules/virtualization.nix
     ../../modules/harden.nix
-    ../../modules/kde6.nix
+    ../../modules/kde.nix
   ];
 
   # Set networking
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 8f86c6e..1ab0e72 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -1,5 +1,4 @@
 {...}: {
-  services.xserver.enable = true;
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.desktopManager.gnome.enable = true;
   programs.dconf.enable = true;
diff --git a/modules/kde.nix b/modules/kde.nix
index fa3c70a..e653ce8 100644
--- a/modules/kde.nix
+++ b/modules/kde.nix
@@ -1,7 +1,20 @@
-{...}: {
-  services.xserver.enable = true;
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.displayManager.defaultSession = "plasmawayland";
-  services.xserver.desktopManager.plasma5.enable = true;
+{pkgs, ...}: {
+  services.displayManager = {
+    sddm.enable = true;
+    sddm.wayland = {
+      enable = true;
+      compositor = "kwin";
+    };
+    defaultSession = "plasma";
+  };
+  services.desktopManager.plasma6.enable = true;
   programs.dconf.enable = true;
+
+  programs.kdeconnect.enable = true;
+
+  environment.systemPackages = with pkgs; [
+    kdePackages.kaccounts-integration
+    kdePackages.kaccounts-providers
+    kdePackages.kio-gdrive
+  ];
 }
diff --git a/modules/kde6.nix b/modules/kde6.nix
deleted file mode 100644
index e567736..0000000
--- a/modules/kde6.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{...}: {
-  services.xserver.enable = true;
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.displayManager.defaultSession = "plasma";
-  services.desktopManager.plasma6.enable = true;
-  programs.dconf.enable = true;
-
-  programs.kdeconnect.enable = true;
-}