From 9b3f9ddb772d357026dd108d89e191a2d939239f Mon Sep 17 00:00:00 2001
From: Superredstone <patrickcanal3@gmail.com>
Date: Sun, 26 Apr 2026 14:58:48 +0200
Subject: [PATCH] refactor(de): move plasma config to separate file

---
 lib/libde.nix                   | 27 -------------------------
 modules/nix-config/de.nix       | 36 ---------------------------------
 modules/nix-config/default.nix  |  1 -
 modules/nix-config/services.nix |  6 +++++-
 modules/programs/default.nix    |  3 ++-
 modules/programs/plasma.nix     | 15 ++++++++++++++
 6 files changed, 22 insertions(+), 66 deletions(-)
 delete mode 100644 lib/libde.nix
 delete mode 100644 modules/nix-config/de.nix
 create mode 100644 modules/programs/plasma.nix

diff --git a/lib/libde.nix b/lib/libde.nix
deleted file mode 100644
index d04ca71..0000000
--- a/lib/libde.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ currentSystemDe, ... }:
-let
-  ifDesktop = de: content: {
-    _type = "if";
-    condition = currentSystemDe == de;
-    inherit content;
-  };
-  ifNotDesktop = de: content: {
-    _type = "if";
-    condition = currentSystemDe != de;
-    inherit content;
-  };
-  ifGnome = ifDesktop "gnome";
-  ifPlasma = ifDesktop "plasma";
-  ifNone = ifDesktop "none";
-  ifNotNone = ifNotDesktop "none";
-in
-{
-  inherit
-    ifDesktop
-    ifNotDesktop
-    ifGnome
-    ifPlasma
-    ifNone
-    ifNotNone
-    ;
-}
diff --git a/modules/nix-config/de.nix b/modules/nix-config/de.nix
deleted file mode 100644
index 78ea5ae..0000000
--- a/modules/nix-config/de.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  pkgs,
-  lib,
-  currentSystemDe,
-  ...
-}:
-let
-  libDe = import ../../lib/libde.nix {
-    inherit currentSystemDe lib;
-  };
-in
-{
-  services = {
-    xserver.enable = true;
-    xserver.excludePackages = with pkgs; [
-      xterm
-    ];
-
-    # Display managers
-    displayManager = {
-      sddm = libDe.ifPlasma {
-        enable = true;
-        wayland.enable = true;
-      };
-    };
-
-    # Desktop environments
-    desktopManager = {
-      plasma6.enable = libDe.ifPlasma true;
-    };
-  };
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [
-    elisa
-    konsole
-  ];
-}
diff --git a/modules/nix-config/default.nix b/modules/nix-config/default.nix
index e70ae15..07d1c93 100644
--- a/modules/nix-config/default.nix
+++ b/modules/nix-config/default.nix
@@ -16,7 +16,6 @@
   ++ (
     if (currentSystemDe != "none") then
       [
-        ./de.nix
         ./fonts.nix
         ./sound.nix
       ]
diff --git a/modules/nix-config/services.nix b/modules/nix-config/services.nix
index 2626779..092704b 100644
--- a/modules/nix-config/services.nix
+++ b/modules/nix-config/services.nix
@@ -1,7 +1,11 @@
-{ ... }:
+{ pkgs, ... }:
 {
   services = {
     pcscd.enable = true;
+    xserver.enable = true;
+    xserver.excludePackages = with pkgs; [
+      xterm
+    ];
     openssh = {
       enable = true;
       hostKeys = [
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
index 58e679d..61468a2 100644
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -9,7 +9,8 @@
 
   ]
   ++ (if currentSystemDe == "niri" then [ ./niri.nix ] else [ ])
-  ++ (if currentSystemDe == "gnome" then [ ./gnome.nix ] else [ ]);
+  ++ (if currentSystemDe == "gnome" then [ ./gnome.nix ] else [ ])
+  ++ (if currentSystemDe == "plasma" then [ ./plasma.nix ] else [ ]);
 
   programs = {
     gamescope = {
diff --git a/modules/programs/plasma.nix b/modules/programs/plasma.nix
new file mode 100644
index 0000000..50da6f9
--- /dev/null
+++ b/modules/programs/plasma.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+{
+  services = {
+    displayManager.sddm = {
+      enable = true;
+      wayland.enable = true;
+    };
+    desktopManager.plasma6.enable = true;
+  };
+
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [
+    elisa
+    konsole
+  ];
+}