Merge pull request 'refactor(sleep): move the s2 sleep change to argon only since s2idle would cost more battery on a laptop that s3 deep sleep' (#63 ) from fix/sleep into main

Reviewed-on: #63
refactor(sleep): move the s2 sleep change to argon only since s2idle would cost more battery on a laptop that s3 deep sleep
2026-07-23 15:08:41 +02:00 · 2026-07-23 15:08:24 +02:00 · 2026-07-23 14:56:59 +02:00 · 2026-07-23 14:51:55 +02:00 · 2026-07-23 14:29:18 +02:00 · 2026-07-20 22:51:44 +02:00
3 changed files with 20 additions and 13 deletions
@@ -28,11 +28,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1783358420,
-        "narHash": "sha256-UEyBpf+XmQe8laXfDzIlo11Er7E0rKrLS8jeMnMj0Ds=",
+        "lastModified": 1784546264,
+        "narHash": "sha256-jxVr5EHMYAOkFvS2k0abIvt6NqyshyWmiHHzV17sT2g=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "0d33882bd46c1f9ef62276700f5e5f2bd6ff6604",
+        "rev": "e3dea8e4792b09a6c0eb5836b0284ad05b1acba0",
        "type": "github"
      },
      "original": {
@@ -43,11 +43,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1783224372,
-        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
+        "lastModified": 1784497964,
+        "narHash": "sha256-vlHUuqAcbcH2RKmHbPiuQzbv1pnzzavXnI62RD0bqCU=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
+        "rev": "241313f4e8e508cb9b13278c2b0fa25b9ca27163",
        "type": "github"
      },
      "original": {
@@ -66,11 +66,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1783349931,
-        "narHash": "sha256-aYE76ATiGBg7/cQ2dHASRq97WvNum4OOIPgZ8xIK0QI=",
+        "lastModified": 1784057377,
+        "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "4fd45857deecb90d2732c87e0315daa48505515e",
+        "rev": "07180a087e4a00720dc0731cbcd8dec796974381",
        "type": "github"
      },
      "original": {
@@ -86,11 +86,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1783357432,
-        "narHash": "sha256-fdRJMFj7yAwST3ZEK6JtuqimYPHnt7I18oOfeyC8f0I=",
+        "lastModified": 1784556533,
+        "narHash": "sha256-tlcP2x7d+ldS3BypTcInqrsOhi6BPuSSTeubfBMmm8Y=",
        "owner": "noctalia-dev",
        "repo": "noctalia-shell",
-        "rev": "7a30ffa420b46a02ceab71aee948648c2c87c7c6",
+        "rev": "815635cf7dc810616c9e6ecf4b9b4f4c54e69905",
        "type": "github"
      },
      "original": {
@@ -30,6 +30,13 @@
  # set hostname
  networking.hostName = "argon";

+  # Use s2idle instead of deep (S3) suspend. On resume from S3 the RDNA4
+  # (Navi 48 / RX 9070) amdgpu does a MODE1 GPU reset that leaves niri with a
+  # black screen until it is restarted. s2idle avoids that reset path.
+  # Host-specific on purpose: laptops (e.g. neon) keep deep S3 for lower
+  # suspend power draw. Merged with bootloader.nix's kernelParams.
+  boot.kernelParams = [ "mem_sleep_default=s2idle" ];
+
  # install state version
  system.stateVersion = "25.11"; # Don't change
 }
@@ -17,7 +17,7 @@
  };

  # kernel options
-  boot.kernelParams = [ "quiet" "acpi.debug_level=0"];
+  boot.kernelParams = [ "quiet" "acpi.debug_level=0" ];
  boot.kernelPackages = pkgs.linuxPackages_latest;
  boot.consoleLogLevel = 2;
Author	SHA1	Message	Date
aaron	274c39b213	Merge pull request 'refactor(sleep): move the s2 sleep change to argon only since s2idle would cost more battery on a laptop that s3 deep sleep' (#63 ) from fix/sleep into main Reviewed-on: #63	2026-07-23 15:08:41 +02:00
aaron	2a3c439993	refactor(sleep): move the s2 sleep change to argon only since s2idle would cost more battery on a laptop that s3 deep sleep	2026-07-23 15:08:24 +02:00
aaron	a2e9ad6035	Merge pull request 'fix(sleep): change sleep mode from s3 deep to s2 idle sleep to prevent issues woth radeon RDNA4 cards' (#62 ) from fix/sleep into main Reviewed-on: #62	2026-07-23 14:56:59 +02:00
aaron	6fdde12804	fix(sleep): change sleep mode from s3 deep to s2 idle sleep to prevent issues woth radeon RDNA4 cards	2026-07-23 14:51:55 +02:00
aaron	32291e63bb	Merge pull request 'chore(update): update flake file' (#61 ) from feature/update into main Reviewed-on: #61	2026-07-23 14:29:18 +02:00
aaron	0e681ec0e2	chore(update): update flake file	2026-07-20 22:51:44 +02:00
aaron	0ce944b327	Merge pull request 'chore(flake): update flake file' (#60 ) from feature/updates into main Reviewed-on: #60	2026-07-06 22:12:41 +02:00