From 79979920958cafd7cbbc8d7cc161b7d3f495ddce Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton@duck.com>
Date: Sat, 25 Jan 2025 18:35:51 -0500
Subject: [PATCH] universedesktop: cleanup desktop definition

---
 .../desktop/displaymanager.nix                | 40 +------------------
 machines/universedesktop/desktop/dwl.nix      |  2 +
 machines/universedesktop/desktop/emptty.nix   | 33 +++++++++++++++
 3 files changed, 37 insertions(+), 38 deletions(-)
 create mode 100644 machines/universedesktop/desktop/emptty.nix

diff --git a/machines/universedesktop/desktop/displaymanager.nix b/machines/universedesktop/desktop/displaymanager.nix
index bdd3857..8c9c97a 100644
--- a/machines/universedesktop/desktop/displaymanager.nix
+++ b/machines/universedesktop/desktop/displaymanager.nix
@@ -1,41 +1,5 @@
-{ config, pkgs, lib, ... }: let
-  empttyConf = pkgs.writeText "emptty-config" ''
-    TTY_NUMBER=7
-
-    WAYLAND_SESSIONS_PATH="${config.services.displayManager.sessionData.desktops}/share/wayland-sessions"
-  '';
-in {
+{ ... }: {
   imports = [
-    ./dwl.nix
+    ./emptty.nix
   ];
-  
-  services.displayManager = {
-    enable = true;
-    execCmd = "${pkgs.emptty}/bin/emptty -d";
-  };
-  systemd.services.display-manager = {
-    enable = true;
-    path = [pkgs.dwl];
-    serviceConfig = {
-      EnvironmentFile = empttyConf;
-      Type="idle";
-      TTYPath="/dev/tty7";
-      TTYReset="yes";
-      SendSIGHUP="yes";
-      KillMode="process";
-    };
-  };
-
-  environment.etc."emptty/conf".source = empttyConf;
-
-  services.displayManager.sessionPackages = [ pkgs.dwl ];
-
-  security.pam.services = {
-    emptty.text = ''
-      auth	substack	sshd
-      account	include	sshd
-      password	substack	sshd
-      session	include sshd
-    '';
-  };
 }
diff --git a/machines/universedesktop/desktop/dwl.nix b/machines/universedesktop/desktop/dwl.nix
index 3bd5801..cd26c86 100644
--- a/machines/universedesktop/desktop/dwl.nix
+++ b/machines/universedesktop/desktop/dwl.nix
@@ -8,6 +8,8 @@ in {
     ./wayland.nix
   ];
 
+  services.displayManager.sessionPackages = [ pkgs.dwl ];
+
   nixpkgs.overlays = [
     (final: prev: {
       wlroots_0_19 = prev.wlroots_0_18.overrideAttrs (old: {
diff --git a/machines/universedesktop/desktop/emptty.nix b/machines/universedesktop/desktop/emptty.nix
new file mode 100644
index 0000000..1086099
--- /dev/null
+++ b/machines/universedesktop/desktop/emptty.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, lib, ... }: let
+  empttyConf = pkgs.writeText "emptty-config" ''
+    TTY_NUMBER=7
+
+    WAYLAND_SESSIONS_PATH="${config.services.displayManager.sessionData.desktops}/share/wayland-sessions"
+  '';
+in {
+  services.displayManager = {
+    enable = true;
+    execCmd = "${pkgs.emptty}/bin/emptty -d";
+  };
+  systemd.services.display-manager = {
+    enable = true;
+    path = [pkgs.dwl];
+    serviceConfig = {
+      EnvironmentFile = empttyConf;
+      Type="idle";
+      TTYPath="/dev/tty7";
+      TTYReset="yes";
+      SendSIGHUP="yes";
+      KillMode="process";
+    };
+  };
+
+  security.pam.services = {
+    emptty.text = ''
+      auth	substack	sshd
+      account	include	sshd
+      password	substack	sshd
+      session	include sshd
+    '';
+  };
+}