From 97675ee585ff02696b3b775636c44d13f338cf61 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Thu, 4 Jan 2024 11:22:46 +0100
Subject: [PATCH] journalwatch config

---
 modules/journalwatch.nix | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index 754878d..5b45ef7 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -498,12 +498,7 @@
           # Ignore.
           ata[0-9]\.00: Entering standby power mode
           ata[0-9]\.00: Entering active power mode
-          Modules linked in:( \S+)+ ?
         '' + (if (config.networking.hostName == "yodaHedgehog") then ''
-          # Ignore.
-          ------------\[ cut here \]------------
-          Hardware name: To Be Filled By O\.E\.M\. To Be Filled By O\.E\.M\./N3150-ITX, BIOS P1\.10 05/20/2015
-          Workqueue: pm pm_runtime_work
           # Not sure about this.
           ACPI BIOS Warning (bug): 32/64X length mismatch in FADT/Gpe0Block: 128/32 (20220331/tbfadt-564)
           hpet: number irqs doesn't agree with number of timers
@@ -518,21 +513,26 @@
           ata4\.00: failed to IDENTIFY \(I/O error, err_mask=0x40\)
           ata4\.00: revalidation failed \(errno=-5\)
           # Ignore very frequent kernel stack traces
+          ------------\[ cut here \]------------
           i915 0000:00:02\.0: drm_WARN_ON\(\(intel_uncore_read\(&dev_priv->uncore, \(\(const i915_reg_t\){ \.reg = \(0x130090\) }\)\) & mask\) != mask\)
           WARNING: CPU: [0-9]+ PID: [0-9]+ at drivers/gpu/drm/i915/vlv_suspend\.c:.*
-          RIP: .*:vlv_suspend_complete\+0x[0-9abcdef]+/0x[0-9abcdef]+ \[i915\]
-          CPU: 0 PID: 9195 Comm: kworker/u8:7 Tainted: G        W          6.1.69 #1-NixOS
+          Modules linked in:( \S+)+ ?
+           irqbypass drivetemp drm deflate fuse( \S+)+
+          CPU: [0-9]+ PID: [0-9]+ Comm: kworker/\S+ Tainted: G        W          6.1.69 #1-NixOS
+          Hardware name: To Be Filled By O\.E\.M\. To Be Filled By O\.E\.M\./N3150-ITX, BIOS P1\.10 05/20/2015
+          Workqueue: pm pm_runtime_work
           Workqueue: events_unbound async_run_entry_fn
+          RIP: .*:vlv_suspend_complete\+0x[0-9abcdef]+/0x[0-9abcdef]+ \[i915\]
           Code: 8b 7b 08 4c 8b 67 50 4d 85 e4 74 25 e8 61 68 25 d0 48 c7 c1 48 c2 3a c1 4c 89 e2 48 c7 c7 88 8b 3d c1 48 89 c6 e8 e8 00 c8 cf <0f> 0b e9 75 f9 ff ff 4c 8b 27 eb d6 66 66 2e 0f 1f 84 00 00 00 00
-          RSP: 0018:ffffb36403b4bda0 EFLAGS: 00010282
+          RSP: 0018:[0-9a-f]+ EFLAGS: [0-9a-f]+
           RAX: 0000000000000000 RBX: ffff981788228000 RCX: 0000000000000027
-          RDX: ffff9817bbe214a8 RSI: 0000000000000001 RDI: ffff9817bbe214a0
-          RBP: ffff981788229c20 R08: ffffffff92459e20 R09: 0000000092cd014a
-          R10: ffffffffffffffff R11: ffffffff9251f768 R12: ffff981740decf10
-          R13: ffff98178822a328 R14: 0000000000000000 R15: ffff98178822b7a0
-          FS:  0000000000000000(0000) GS:ffff9817bbe00000(0000) knlGS:0000000000000000
+          RDX: [0-9a-f]+ RSI: 0000000000000001 RDI: [0-9a-f]+
+          RBP: ffff981788229c20 R08: [0-9a-f]+ R09: [0-9a-f]+
+          R10: [0-9a-f]+ R11: [0-9a-f]+ R12: ffff981740decf10
+          R13: [0-9a-f]+ R14: [0-9a-f]+ R15: ffff98178822b7a0
+          FS:  0000000000000000\(0000\) GS:[0-9a-f]+\(0000\) knlGS:0000000000000000
           CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
-          CR2: 00007f5b24f8ca1c CR3: 000000012a210000 CR4: 00000000001006f0
+          CR2: [0-9a-f]+ CR3: 000000012a210000 CR4: [0-9a-f]+
           Call Trace:
            <TASK>
            \? \S+\+0x[0-9abcdef]+/0x[0-9abcdef]+( \[i915\])?