suspend: switch from deep -> s2idle for s76

  - suspend method deep (suspend-to-RAM) is broken on darp11 (arrow-lake)
    switch to s2idle suspend method to provide some battery saving
    instead of disabling suspension entirely
  - re-enable suspenion on all darp11 targets
  - add suspend.mode option to power cfg

Signed-off-by: Kajus Naujokaitis <kajus.naujokaitis@unikie.com>

Author: kajusnau

modules/common/services/power.nix

@@ -245,6 +245,15 @@ let
     '';
   };
 
+  genericSleepConf = ''
+    AllowHibernation=no
+    AllowHybridSleep=no
+    AllowSuspendThenHibernate=no
+  ''
+  + optionalString (!cfg.suspend.enable) ''
+    AllowSuspend=no
+  '';
+
 in
 {
   options.ghaf.services.power-manager = {
@@ -280,15 +289,35 @@ in
       '';
     };
 
-    allowSuspend = mkOption {
-      type = types.bool;
-      default = true;
-      description = ''
-        Whether to enable system suspension.
+    suspend = {
+      enable = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to enable system suspension.
 
-        If disabled, the system will not respond to suspend requests, and all VMs with a power management profile enabled are
-        prohibited to perform any suspend action.
-      '';
+            If disabled, the system will not respond to suspend requests, and all VMs with a
+            power management profile enabled are prohibited to perform any suspend action.
+        '';
+      };
+
+      mode = mkOption {
+        type = types.nullOr (
+          types.enum [
+            "s2idle"
+            "shallow"
+            "deep"
+          ]
+        );
+        default = null;
+        description = ''
+          The memory suspend mode to use.
+
+          To check which modes are supported, run `cat /sys/power/mem_sleep`.
+
+          More info: https://docs.kernel.org/admin-guide/pm/sleep-states.html
+        '';
+      };
     };
 
     vm = {
@@ -412,15 +441,7 @@ in
         }
       ];
 
-      # Prohibited sleep actions for VMs
-      systemd.sleep.extraConfig = ''
-        AllowHibernation=no
-        AllowHybridSleep=no
-        AllowSuspendThenHibernate=no
-      ''
-      + optionalString (!cfg.allowSuspend) ''
-        AllowSuspend=no
-      '';
+      systemd.sleep.extraConfig = genericSleepConf;
 
       powerManagement = optionalAttrs cfg.vm.enable {
         powerDownCommands = optionalString cfg.vm.pciSuspend (
@@ -467,6 +488,9 @@ in
         powerDownCommands = lib.mkBefore ''
           ${getExe ghaf-powercontrol} turn-off-displays '*'
         '';
+        powerUpCommands = lib.mkBefore ''
+          ${getExe ghaf-powercontrol} turn-on-displays '*'
+        '';
       };
 
       # Override systemd actions for suspend, poweroff, and reboot
@@ -497,7 +521,7 @@ in
       # Logind configuration for desktop
       services.logind.settings.Login =
         let
-          lidEvent = if cfg.allowSuspend then "suspend" else "lock";
+          lidEvent = if cfg.suspend.enable then "suspend" else "lock";
         in
         mkDefault {
           HandleLidSwitch = lidEvent;
@@ -519,16 +543,15 @@ in
     (mkIf cfg.host.enable {
       services.logind.settings.Login.HandleLidSwitch = mkDefault "ignore";
 
-      systemd.sleep.extraConfig = ''
-        AllowHibernation=no
-        AllowHybridSleep=no
-        AllowSuspendThenHibernate=no
-      ''
-      + optionalString (!cfg.allowSuspend) ''
-        AllowSuspend=no
-      '';
+      systemd.sleep.extraConfig = genericSleepConf;
+
+      # We can accomplish the same via systemd.sleep.extraConfig MemorySleepMode
+      # but it seems keyboard wakeup stops functioning with that approach
+      boot.kernelParams = optionals (cfg.suspend.mode != null) [
+        "mem_sleep_default=${cfg.suspend.mode}"
+      ];
 
-      systemd.targets = optionalAttrs cfg.allowSuspend {
+      systemd.targets = optionalAttrs cfg.suspend.enable {
         "pre-sleep-actions" = {
           description = "Target for pre-sleep host actions";
           unitConfig.StopWhenUnneeded = true;
@@ -552,7 +575,7 @@ in
 
       systemd.services = mkMerge [
         # suspend/resume action units
-        (optionalAttrs cfg.allowSuspend (
+        (optionalAttrs cfg.suspend.enable (
           lib.listToAttrs (
             flatten (
               map

modules/desktop/graphics/cosmic/default.nix

@@ -76,7 +76,7 @@ in
           If disabled, the default timeouts will be set to 'Never'.
           However, users can still manually configure the settings via COSMIC Settings to override this behavior.
 
-          If 'config.ghaf.services.power-manager.allowSuspend' is false, suspension will not occur
+          If 'config.ghaf.services.power-manager.suspend.enable' is false, suspension will not occur
           regardless of this setting.
         '';
       };

modules/profiles/graphics.nix

@@ -32,7 +32,7 @@ in
 
           Disabling this option is the same as setting all idle timeouts to '0'.
 
-          If 'config.ghaf.services.power-manager.allowSuspend' is false, suspension will not occur
+          If 'config.ghaf.services.power-manager.suspend.enable' is false, suspension will not occur
           regardless of this setting.
         '';
       };

modules/profiles/orin.nix

@@ -38,7 +38,7 @@ in
       };
 
       # Disable suspend by default, not working as intended
-      services.power-manager.allowSuspend = false;
+      services.power-manager.suspend.enable = false;
 
       graphics.cosmic = {
         # Crucial for Orin devices to use the correct render device

packages/ghaf-powercontrol/package.nix

@@ -121,7 +121,7 @@ writeShellApplication {
         ;;
       suspend)
       ${
-        if ghafConfig.services.power-manager.allowSuspend then
+        if ghafConfig.services.power-manager.suspend.enable then
           ''
             systemctl suspend
           ''

packages/pkgs-by-name/ghaf-build-helper/package.nix

@@ -89,7 +89,7 @@ writeShellApplication {
         done
 
         export NIX_SSHOPTS="-o ProxyJump=root@$proxy_jump"
-        nixos-rebuild --flake "$build_target" --target-host root@ghaf-host --fast "''${args[@]}"
+        nixos-rebuild --flake "$build_target" --target-host root@ghaf-host --no-reexec "''${args[@]}"
   '';
   meta = {
     description = "Helper script to use nixos-rebuild without persistent changes of the ssh configuration.";

targets/laptop/flake-module.nix

@@ -213,7 +213,7 @@ let
         ghaf = {
           reference.profiles.mvp-user-trial.enable = true;
           partitioning.disko.enable = true;
-          services.power-manager.allowSuspend = false; # Suspension is broken (SSRCSP-7016)
+          services.power-manager.suspend.mode = "s2idle";
 
           # Enable PCI ACS override to split IOMMU groups
           # Needed to separate Ethernet (8086:550a) from Audio devices
@@ -245,8 +245,7 @@ let
         ghaf = {
           reference.profiles.mvp-user-trial.enable = true;
           partitioning.disko.enable = true;
-          profiles.graphics.idleManagement.enable = true;
-          services.power-manager.allowSuspend = false; # Suspension is broken (SSRCSP-7016)
+          services.power-manager.suspend.mode = "s2idle";
 
           # Enable storeOnDisk for all VMs
           virtualization.microvm.storeOnDisk = true;
@@ -420,8 +419,7 @@ let
         ghaf = {
           reference.profiles.mvp-user-trial.enable = true;
           partitioning.disko.enable = true;
-          profiles.graphics.idleManagement.enable = true;
-          services.power-manager.allowSuspend = false; # Suspension is broken (SSRCSP-7016)
+          services.power-manager.suspend.mode = "s2idle";
 
           # Enable PCI ACS override to split IOMMU groups
           # Needed to separate Ethernet (8086:550a) from Audio devices
@@ -453,8 +451,7 @@ let
         ghaf = {
           reference.profiles.mvp-user-trial.enable = true;
           partitioning.disko.enable = true;
-          profiles.graphics.idleManagement.enable = true;
-          services.power-manager.allowSuspend = false; # Suspension is broken (SSRCSP-7016)
+          services.power-manager.suspend.mode = "s2idle";
 
           # Enable storeOnDisk for all VMs
           virtualization.microvm.storeOnDisk = true;