options/custom/desktops/default.nix

@@ -3,21 +3,12 @@
   lib,
   ...
 }:
-with lib; let
+with lib; {
-  cfg = config.custom.desktops;
+  config.custom.desktops = mkIf config.custom.full {
-in {
+    #// gnome.enable = true;
-  options.custom.desktops = {
+    #// hyprland.enable = true;
-    enable = mkOption {default = config.custom.minimal;};
+    #// kde.enable = true;
-    desktop = mkOption {default = "niri";};
+    niri.enable = true;
-  };
+    #// sway.enable = true;
-
-  config = mkIf cfg.enable {
-    custom.desktops = {
-      gnome.enable = cfg.desktop == "gnome";
-      hyprland.enable = cfg.desktop == "hyprland";
-      kde.enable = cfg.desktop == "kde";
-      niri.enable = cfg.desktop == "niri";
-      sway.enable = cfg.desktop == "sway";
-    };
   };
 }

options/custom/services/hypridle.nix

@@ -9,7 +9,6 @@ with lib; let
   hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
   hyprlock = "${config.home-manager.users.${config.custom.username}.programs.hyprlock.package}/bin/hyprlock";
   loginctl = "${pkgs.systemd}/bin/loginctl";
-  niri = "${config.programs.niri.package}/bin/niri";
   pgrep = "${pkgs.procps}/bin/pgrep";
   pw-cli = "${pkgs.pipewire}/bin/pw-cli";
   systemctl = "${pkgs.systemd}/bin/systemctl";
@@ -38,12 +37,7 @@ in {
 
           {
             timeout = 20 * 60; # Seconds
-            on-timeout =
+            on-timeout = "${hyprctl} dispatch dpms off";
-              if config.custom.desktops.desktop == "hyprland"
-              then "${hyprctl} dispatch dpms off"
-              else if config.custom.desktops.desktop == "niri"
-              then "${niri} msg action power-off-monitors"
-              else "";
           }
 
           {
@@ -53,13 +47,5 @@ in {
         ];
       };
     };
-
-    # BUG: graphical-session-pre.target may not have WAYLAND_DISPLAY set, so service is skipped
-    # https://github.com/nix-community/home-manager/issues/5899
-    systemd.user.services.hypridle = {
-      Unit = {
-        After = mkForce ["graphical-session.target"]; # graphical-session-pre.target
-      };
-    };
   };
 }

profiles/console/default.nix

@@ -12,9 +12,9 @@
     minimal = true;
     profile = "console";
 
-    desktops = {
+    desktops.gnome = {
-      desktop = "gnome";
+      enable = true;
-      gnome.gdm = false;
+      gdm = false;
     };
 
     programs = {

profiles/laptop/default.nix

@@ -1,7 +1,7 @@
 {
   custom = {
     full = true;
-    profile = "desktop"; # Inherit desktop profile
+    profile = "desktop"; # Inherit desktop
   };
 
   #!! Rebuild offline - drastically increases initial download and resulting closure size