universedesktop: cleanup desktop definition

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
-    '';
-  };
 }

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: {

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
+    '';
+  };
+}