Revert "Use direct hibernate on nix-book lid close"

This reverts commit 2c70504c43.

home/roles/email/default.nix

@@ -43,14 +43,28 @@ in
       Inbox ~/Mail/INBOX
       SubFolders Verbatim
 
-      # Channel Configuration - Sync All
-      Channel proton
+      # Channel Configuration - Main (excludes Sent)
+      Channel proton-main
       Far :proton-remote:
       Near :proton-local:
-      Patterns *
+      Patterns * !Sent
       Create Both
       Expunge Both
       SyncState *
+
+      # Channel Configuration - Sent (pull only)
+      Channel proton-sent
+      Far :proton-remote:Sent
+      Near :proton-local:Sent
+      Create Near
+      Expunge Near
+      Sync Pull
+      SyncState *
+
+      # Group both channels
+      Group proton
+      Channel proton-main
+      Channel proton-sent
     '';
 
     # msmtp configuration

machines/nix-book/configuration.nix

@@ -40,14 +40,15 @@
 
   boot.initrd.luks.devices."luks-b614167b-9045-4234-a441-ac6f60a96d81".device = "/dev/disk/by-uuid/b614167b-9045-4234-a441-ac6f60a96d81";
 
-  # S3 deep sleep broken on Alder Lake - use direct hibernate on lid close
   services.logind.settings.Login = {
-    HandleLidSwitch = "hibernate";
-    HandleLidSwitchExternalPower = "hibernate";
-    HandleLidSwitchDocked = "hibernate";
+    HandleLidSwitch = "suspend-then-hibernate";
     HandlePowerKey = "hibernate";
     HandlePowerKeyLongPress = "poweroff";
   };
+  systemd.sleep.extraConfig = ''
+    HibernateDelaySec=30m
+    SuspendState=mem
+  '';
 
   networking.hostName = "nix-book"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.