From c1ec0f3fcbcdd6f64a3af611c5e369bb64320555 Mon Sep 17 00:00:00 2001
From: Doloro1978 <doloroo@proton.me>
Date: Fri, 10 Apr 2026 01:43:55 +0100
Subject: [PATCH] stuff

---
 .sops.yaml                         |  1 +
 config/modules/surface_patches.nix | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.sops.yaml b/.sops.yaml
index 05d064c..7a23a2f 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -9,4 +9,5 @@ creation_rules:
       - "age1x3lahhkefkap67cdmdjcqaxan9hp62er78akr79v9m73nvgugpeqk0y32a" # laptop-user-doloro
       - "age1exzngtk4d9vcsmcq6ap5xx3ca9qacqjkrv86ymged7msx9z6vfyqsf5sjq" # laptop-system
       - "age1fw4xnh2q52juce94ffn54js708cr6umfwpv0mykuddkea7kr4f0q7a9h05" # rpi5
+      - "age1pa8cecxaw4y4zea6zjnt0k0mz38g4qunmp6trwy5fvdvw88ttcgsv2dgrv" # laptop-surface-user-doloro
       - "age1kc0xu0ue2nrrr7w4gam7wlzackv8jv243rxwwndgxjqklgtnp5csdtpgzp" # laptop-surface-system
diff --git a/config/modules/surface_patches.nix b/config/modules/surface_patches.nix
index b52120b..6b0ff6e 100644
--- a/config/modules/surface_patches.nix
+++ b/config/modules/surface_patches.nix
@@ -10,11 +10,25 @@
   };
   modules.surface-patches = {
     nixos =
-      { pkgs, ... }:
+      { pkgs, lib, ... }:
       {
         imports = with inputs; [
           x1e-kernel.nixosModules.default
         ];
+
+        # Prevent reboot hang - qcom_smd_qrtr workers stuck in D-state
+        systemd.settings.Manager.DefaultTimeoutStopSec = "15s";
+        systemd.settings.Manager.DefaultDeviceTimeoutSec = "15s";
+
+        # Hardware watchdog (SBSA Generic Watchdog) as safety net
+        systemd.settings.Manager = {
+          KExecWatchdogSec = "30s";
+          RebootWatchdogSec = "30s";
+          RuntimeWatchdogSec = "30s";
+        };
+
+        # Override udevd stop timeout (D-state workers can't be killed)
+        systemd.services.systemd-udevd.serviceConfig.TimeoutStopSec = lib.mkForce "10s";
       };
   };
 }