From f19ae43a4043fe82de98e7a26705e21ce1cfc6ef Mon Sep 17 00:00:00 2001
From: twoneis <sanjay29@sapura.de>
Date: Mon, 24 Jun 2024 17:17:49 +0200
Subject: [PATCH] separate plasma from sddm

---
 modules/default.nix                      |  8 +++++---
 modules/plasma/default.nix               | 11 -----------
 modules/sddm/default.nix                 | 12 ++++++++++++
 modules/{plasma => sddm}/sddm-theme.conf |  0
 4 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 modules/sddm/default.nix
 rename modules/{plasma => sddm}/sddm-theme.conf (100%)

diff --git a/modules/default.nix b/modules/default.nix
index 5f030f7..aeb597e 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -8,6 +8,7 @@
     ./home
     ./niri
     ./plasma
+    ./sddm
     ./virt
   ];
 
@@ -74,14 +75,15 @@
     };
   };
 
-  # Needed for some features in nautilus such as auto-mounting and trash
-  services.gvfs.enable = true;
-
   users.users.twoneis = {
     isNormalUser = true;
     description = "twoneis";
     extraGroups = [ "networkmanager" "wheel" ];
   };
+  services = {
+    # Needed for some features in nautilus such as auto-mounting and trash
+    gvfs.enable = true;
+  };
 
   programs.fish.enable = true;
   users.defaultUserShell = pkgs.fish;
diff --git a/modules/plasma/default.nix b/modules/plasma/default.nix
index 3806586..8dedf6c 100644
--- a/modules/plasma/default.nix
+++ b/modules/plasma/default.nix
@@ -1,14 +1,5 @@
 { pkgs, lib, config, ... }: lib.mkIf (config.withPlasma) {
   services = {
-    displayManager.sddm = {
-      enable = true;
-      wayland = {
-        enable = true;
-        compositor = "kwin";
-      };
-      theme = "where_is_my_sddm_theme";
-    };
-
     desktopManager.plasma6 = {
       enable = true;
     };
@@ -20,8 +11,6 @@
       konsole
       oxygen
     ];
-
-    systemPackages = [ (pkgs.where-is-my-sddm-theme.override ({ themeConfig = builtins.readFile ./sddm-theme.conf; })) ];
   };
 
   programs.dconf.enable = true;
diff --git a/modules/sddm/default.nix b/modules/sddm/default.nix
new file mode 100644
index 0000000..66fb369
--- /dev/null
+++ b/modules/sddm/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, lib, config, ... }: lib.mkIf(config.withNiri or config.withPlasma or config.withGnome){
+  services.displayManager.sddm = {
+    enable = true;
+    wayland = {
+      enable = true;
+      compositor = "kwin";
+    };
+    theme = "where_is_my_sddm_theme";
+  };
+
+  environment.systemPackages = [ (pkgs.where-is-my-sddm-theme.override ({ themeConfig = builtins.readFile ./sddm-theme.conf; })) ];
+}
diff --git a/modules/plasma/sddm-theme.conf b/modules/sddm/sddm-theme.conf
similarity index 100%
rename from modules/plasma/sddm-theme.conf
rename to modules/sddm/sddm-theme.conf