From f6515dfc93ba30a134ba11ee41ff06d1bbccc2f9 Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton@duck.com>
Date: Sat, 25 Jan 2025 18:45:08 -0500
Subject: [PATCH] universedesktop: Further cleanup, try niri

---
 machines/universedesktop/desktop/default.nix | 3 ++-
 machines/universedesktop/desktop/niri.nix    | 7 +++++++
 machines/universedesktop/desktop/plasma.nix  | 3 +--
 machines/universedesktop/desktop/sddm.nix    | 4 ++++
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 machines/universedesktop/desktop/niri.nix
 create mode 100644 machines/universedesktop/desktop/sddm.nix

diff --git a/machines/universedesktop/desktop/default.nix b/machines/universedesktop/desktop/default.nix
index 03962b5..7622ee7 100644
--- a/machines/universedesktop/desktop/default.nix
+++ b/machines/universedesktop/desktop/default.nix
@@ -1,6 +1,7 @@
 { config, pkgs, lib, ... }: {
   imports = [
     ./audio.nix
-    ./plasma.nix
+    ./displaymanager.nix
+    ./niri.nix
   ];
 }
diff --git a/machines/universedesktop/desktop/niri.nix b/machines/universedesktop/desktop/niri.nix
new file mode 100644
index 0000000..785e197
--- /dev/null
+++ b/machines/universedesktop/desktop/niri.nix
@@ -0,0 +1,7 @@
+{ config, pkgs, lib, ... }: {
+  imports = [
+    ./wayland.nix
+  ];
+
+  programs.niri.enable = true;
+}
diff --git a/machines/universedesktop/desktop/plasma.nix b/machines/universedesktop/desktop/plasma.nix
index 1e47685..2bdc483 100644
--- a/machines/universedesktop/desktop/plasma.nix
+++ b/machines/universedesktop/desktop/plasma.nix
@@ -1,11 +1,10 @@
 { config, pkgs, lib, ... }: {
   imports = [
     ./wayland.nix
+    ./sddm.nix
   ];
 
   services.xserver.enable = true;
-  services.displayManager.sddm.enable = true;
-  services.displayManager.sddm.wayland.enable = true;
   services.desktopManager.plasma6.enable = true;
   
   environment.plasma6.excludePackages = with pkgs.kdePackages; [
diff --git a/machines/universedesktop/desktop/sddm.nix b/machines/universedesktop/desktop/sddm.nix
new file mode 100644
index 0000000..dd95645
--- /dev/null
+++ b/machines/universedesktop/desktop/sddm.nix
@@ -0,0 +1,4 @@
+{ config, pkgs, lib, ... }: {
+  services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
+}