From 1febd326fbcb1eb87254c62d87b09d69c26dcaad Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 1 May 2024 08:58:36 +0200
Subject: [PATCH] remove plasma5

---
 modules/default.nix           |  1 -
 modules/plasma/6.nix          | 32 --------------------------------
 modules/plasma/default.nix    | 17 ++++++++---------
 systems/benzaiten/default.nix |  2 +-
 systems/kuraokami/default.nix |  2 +-
 5 files changed, 10 insertions(+), 44 deletions(-)
 delete mode 100644 modules/plasma/6.nix

diff --git a/modules/default.nix b/modules/default.nix
index 4de9d50..21a718f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -16,7 +16,6 @@
     ./moodle-dl
     ./nix
     ./plasma
-    ./plasma/6.nix
     ./printing
     ./repo-sync
     ./ssh
diff --git a/modules/plasma/6.nix b/modules/plasma/6.nix
deleted file mode 100644
index 8ac6441..0000000
--- a/modules/plasma/6.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, lib, ... }:
-
-let cfg = config.jopejoe1.plasma6;
-in {
-  options.jopejoe1.plasma6 = {
-    enable = lib.mkEnableOption "Enable KDE Plasma 6";
-  };
-
-  config = lib.mkIf cfg.enable {
-    services = {
-      xserver = {
-        enable = true;
-
-        libinput.enable = true;
-
-        displayManager.sddm = {
-          enable = true;
-          enableHidpi = true;
-        };
-      };
-      desktopManager.plasma6 = {
-        enable = true;
-        enableQt5Integration = true;
-      };
-    };
-
-    programs.kdeconnect = { enable = true; };
-
-    networking.networkmanager.enable = true;
-  };
-}
-
diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix
index a1cd63f..86d01fe 100644
--- a/modules/plasma/default.nix
+++ b/modules/plasma/default.nix
@@ -10,17 +10,16 @@ in {
     services = {
       xserver = {
         enable = true;
-
         libinput.enable = true;
+      };
 
-        displayManager.sddm = {
-          enable = true;
-          enableHidpi = true;
-        };
-        desktopManager.plasma5 = {
-          enable = true;
-          useQtScaling = true;
-        };
+      displayManager.sddm = {
+        enable = true;
+        enableHidpi = true;
+      };
+      desktopManager.plasma6 = {
+        enable = true;
+        enableQt5Integration = true;
       };
     };
 
diff --git a/systems/benzaiten/default.nix b/systems/benzaiten/default.nix
index 98c40bd..07bafad 100644
--- a/systems/benzaiten/default.nix
+++ b/systems/benzaiten/default.nix
@@ -14,7 +14,7 @@
     bluetooth.enable = true;
     local.enable = true;
     nix.enable = true;
-    plasma6.enable = true;
+    plasma.enable = true;
     user = {
       jopejoe1.enable = true;
       root.enable = true;
diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix
index 0af64db..baf8a31 100644
--- a/systems/kuraokami/default.nix
+++ b/systems/kuraokami/default.nix
@@ -22,7 +22,7 @@
     doc.enable = true;
     local.enable = true;
     nix.enable = true;
-    plasma6.enable = true;
+    plasma.enable = true;
     printing.enable = true;
     steam.enable = true;
     ssh.enable = true;