From 3bc9f667e1ff24fde889bfc9926e7785b7acd2ce Mon Sep 17 00:00:00 2001
From: ergosteur <1992147+ergosteur@users.noreply.github.com>
Date: Mon, 28 Sep 2026 23:18:08 -0400
Subject: [PATCH] Set up suspend-then-hibernate (16G swapfile, resume, polkit
 override)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 CLAUDE.md              |  6 +++++-
 NEON-CUSTOMIZATIONS.md | 42 ++++++++++++++++++++++++++++++++++++++++++
 ZRAM.md                |  5 ++++-
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/CLAUDE.md b/CLAUDE.md
index 450608c..2c11091 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -167,4 +167,8 @@ kernels) plus the 6.17 fallback, `/tmp` on tmpfs + localepurge to spare
 the microSD root, the removed r8152 DKMS driver, disabled tailscaled,
 and third-party apt repos and hand-installed tools. **Suspend must stay
 `s2idle`**: S3 (`deep`) made the microSD reader drop off on resume and
-remounted `/` read-only (2026-09-27).
+remounted `/` read-only (2026-09-27). **Suspend-then-hibernate** (after
+3h asleep) is set up instead (2026-09-28): 16GB `/swapfile` at pri 10,
+`resume=`/`resume_offset=17674240` in GRUB + initramfs, a polkit rule
+re-enabling hibernate (Ubuntu blocks it); details in
+`NEON-CUSTOMIZATIONS.md`.
diff --git a/NEON-CUSTOMIZATIONS.md b/NEON-CUSTOMIZATIONS.md
index 486eaec..bab7d30 100644
--- a/NEON-CUSTOMIZATIONS.md
+++ b/NEON-CUSTOMIZATIONS.md
@@ -131,6 +131,48 @@ Tested 2026-09-27. The firmware offers both `s2idle` (default) and `deep`
   That one comes from ACPI LPIT, which isn't wired up properly under
   coreboot here: it read 270µs for the same suspend.
 
+## Suspend-then-hibernate (set up 2026-09-28)
+
+A lid close suspends (`s2idle`, instant). If the machine is still asleep
+after **3 hours**, systemd wakes it (RTC), writes a hibernation image to
+disk and powers off. This protects against a dead battery without
+writing a multi-GB image on every lid close, which is why this was
+chosen over hybrid sleep. It doesn't need S3.
+
+Pieces:
+- **16GB `/swapfile`**, used for the hibernation image (sized to RAM for
+  the worst case; a typical image is ~4GB).
+  fstab `/swapfile none swap sw,pri=10 0 0`: priority 10 < zram's 100,
+  so normal swapping still goes to zram. Backup of the old fstab:
+  `/etc/fstab.bak-2026-09-28`.
+- **Resume location**: `resume=UUID=3af45daa-b8c2-4053-9574-a958e0c3ea68
+  resume_offset=17674240` in `GRUB_CMDLINE_LINUX_DEFAULT` (backup
+  `/etc/default/grub.bak-2026-09-28`) and in
+  `/etc/initramfs-tools/conf.d/resume`, then `update-initramfs -u -k all`
+  + `update-grub`. **If `/swapfile` is ever recreated, its offset
+  changes.** Get the new one with
+  `sudo filefrag -v /swapfile | awk '$1=="0:"{print $4}'` (strip the
+  trailing `..`), then update both places and rerun both commands.
+- **`/etc/systemd/sleep.conf.d/50-suspend-then-hibernate.conf`**:
+  `HibernateDelaySec=3h`.
+- **`/etc/polkit-1/rules.d/10-enable-hibernate.rules`**: Ubuntu's
+  `/usr/share/polkit-1/rules.d/com.ubuntu.desktop.rules` returns `NO` for
+  all `login1`/`upower` hibernate actions, so logind reported
+  `CanHibernate`/`CanSuspendThenHibernate` = `no` even though its sleep
+  checks passed (seen with
+  `systemctl service-log-level systemd-logind debug`). This rule sorts
+  earlier and returns `YES` for local, active users.
+- **Plasma**: PowerDevil owns the lid, so each Power Management profile's
+  sleep mode must be set to "Standby, then hibernate" in System Settings.
+
+Tested 2026-09-28 with `systemctl hibernate`: a 3.8GB image, powered off,
+and the session resumed intact (uptime carried over, root `rw`). Right
+after resume, one readahead READ failed on `sda` ("device offline or
+changed") while the microSD reader was being reset. That's harmless:
+readahead failures are dropped, and ext4 logged no errors and stayed
+`clean`. It's the same reader re-attach that breaks S3, but a hibernate
+resume is a cold boot and the reader was back in time.
+
 ## Networking
 
 - **Realtek USB Ethernet (`enx00e04c68003e`, r8152-family 2.5G
diff --git a/ZRAM.md b/ZRAM.md
index 8b88e5e..437ac37 100644
--- a/ZRAM.md
+++ b/ZRAM.md
@@ -66,7 +66,10 @@ zram-related on the kernel command line.
   guides set it to `0`, since zram has no seek cost and readahead just
   wastes work.
 - **The unused `/swapfile`** (512MiB, dated 2026-03-04, fstab line
-  commented out) was deleted.
+  commented out) was deleted. On 2026-09-28 a new **16GB `/swapfile`**
+  was added at priority 10 (below zram's 100) for hibernation. See
+  "Suspend-then-hibernate" in `NEON-CUSTOMIZATIONS.md`. zram is still
+  the everyday swap.
 
 ## Reapplying on a fresh neon install