Swtich greetd to its own enable module

machines/productivity-vm/configuration.nix

@@ -29,7 +29,6 @@
     useOSProber = true;
   };
   virtualisation.vmware.guest.enable = true;
-  services.greetd.enable = false;
   # Setup system configuration
   nathan = {
     programs = { games = false; };
@@ -42,6 +41,7 @@
       setupGrub = false;
       nix.autoUpdate = false;
       harden = false;
+      hyprland.enableGreetd = false;
     };
   };
   # Configure networking

modules/linux/default.nix

@@ -182,6 +182,12 @@ in {
               description = "Whether to setup hyprland";
               type = lib.types.bool;
             };
+            enableGreetd = mkOption {
+              default = config.nathan.config.isDesktop;
+              example = true;
+              description = "Whether to setup greetd";
+              type = lib.types.bool;
+            };
           };
           # Virtualization configuration
           # All on by default if the system is a desktop

modules/linux/hyprland.nix

@@ -1,23 +1,32 @@
 { config, lib, pkgs, inputs, ... }:
 let nc = config.nathan.config;
 in with lib; {
-  config = mkIf nc.hyprland.enable {
-    # Turn on GDM for login
-    services.xserver = {
-      enable = true;
-      autorun = false;
-      # Enable plasma for the applications
-      desktopManager.plasma5.enable = true;
-    };
+  config = mkMerge [
+    (mkIf nc.hyprland.enableGreetd {
       # Greetd for login
       programs.regreet = {
         enable = true;
         settings = { GTK = { font_name = "Roboto 16"; }; };
       };
       services.greetd = {
-      enable = lib.mkDefault true;
+        enable = true;
         settings = { default_session.command = "cage -s -- regreet"; };
       };
+      environment.systemPackages = with pkgs; [
+        # Greeter packages
+        cage
+        config.programs.regreet.package
+        gnome.adwaita-icon-theme
+      ];
+    })
+    (mkIf nc.hyprland.enable {
+      # Turn on GDM for login
+      services.xserver = {
+        enable = true;
+        autorun = false;
+        # Enable plasma for the applications
+        desktopManager.plasma5.enable = true;
+      };
       # Setup drivers
       hardware.opengl = {
         # Enable vulkan
@@ -27,10 +36,6 @@ in with lib; {
       };
       # Basic packages that are effectively required for a graphical system
       environment.systemPackages = with pkgs; [
-      # Greeter packages
-      cage
-      config.programs.regreet.package
-      gnome.adwaita-icon-theme
         # GTK Theming
         gtk-engine-murrine
         gtk_engines
@@ -68,5 +73,6 @@ in with lib; {
 
       environment.sessionVariables = { MOZ_ENABLE_WAYLAND = "1"; };
 
-  };
+    })
+  ];
 }