Consolidate displayManager module options under the new display module options, and include the choices as enums

modules/core/gdm.nix

@@ -5,10 +5,10 @@
 }:
 with lib;
 let
-  cfg = config.modules.displayManager;
+  cfg = config.modules.display;
 in
 {
-  config = mkIf (cfg.displayManager == "gdm") {
+  config = mkIf (cfg.manager == "gdm") {
     services.displayManager.gdm = {
       enable = true;
     };

modules/core/sddm.nix

@@ -5,10 +5,10 @@
 }:
 with lib;
 let
-  cfg = config.modules.displayManager;
+  cfg = config.modules.display;
 in
 {
-  config = mkIf (cfg.displayManager == "sddm") {
+  config = mkIf (cfg.manager == "sddm") {
     services.displayManager.sddm = {
       enable = true;
       wayland.enable = true;

modules/options/default.nix

@@ -5,7 +5,6 @@
   imports = [
     ./discord.nix
     ./display.nix
-    ./displayManager.nix
     ./gnomeBoxes.nix
     ./gpg.nix
     ./hyprland.nix

modules/options/display.nix

@@ -5,6 +5,17 @@
 with lib;
 {
   options.modules.display = {
+    manager = mkOption {
+      type = types.enum [
+        "gdm"
+        "sddm"
+      ];
+      default = "sddm";
+      description = ''
+        The display manager to use.
+      '';
+    };
+
     scale = mkOption {
       type = types.int;
       default = 1;

modules/options/displayManager.nix

@@ -1,19 +0,0 @@
-{
-  lib,
-  ...
-}:
-with lib;
-{
-  options.modules.displayManager = {
-    displayManager = mkOption {
-      type = types.enum [
-        "gdm"
-        "sddm"
-      ];
-      default = "sddm";
-      description = ''
-        The display manager to use.
-      '';
-    };
-  };
-}

profiles/desktop/default.nix

@@ -15,7 +15,7 @@
     ];
   };
   modules.plasma.enable = false;
-  modules.displayManager.displayManager = "gdm";
+  modules.display.manager = "gdm";
 
   modules.localsend.enable = true;
 
@@ -27,4 +27,4 @@
   modules.discord.enable = true;
 
   modules.tailscale.enable = true;
-}
+}