diff --git a/modules/core/gdm.nix b/modules/core/gdm.nix index 89be880..8d1a845 100644 --- a/modules/core/gdm.nix +++ b/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; }; diff --git a/modules/core/sddm.nix b/modules/core/sddm.nix index 3d6eddd..34599e2 100644 --- a/modules/core/sddm.nix +++ b/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; diff --git a/modules/options/default.nix b/modules/options/default.nix index 572fda7..34f71db 100644 --- a/modules/options/default.nix +++ b/modules/options/default.nix @@ -5,7 +5,6 @@ imports = [ ./discord.nix ./display.nix - ./displayManager.nix ./gnomeBoxes.nix ./gpg.nix ./hyprland.nix diff --git a/modules/options/display.nix b/modules/options/display.nix index 9f13a11..d55ab10 100644 --- a/modules/options/display.nix +++ b/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; diff --git a/modules/options/displayManager.nix b/modules/options/displayManager.nix deleted file mode 100644 index 32f689f..0000000 --- a/modules/options/displayManager.nix +++ /dev/null @@ -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. - ''; - }; - }; -} diff --git a/profiles/desktop/default.nix b/profiles/desktop/default.nix index 6f616de..dc0388e 100644 --- a/profiles/desktop/default.nix +++ b/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; -} \ No newline at end of file +}