From aa65c99012e3bba050d92afc2ad895c5cafc4bd5 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Wed, 27 Sep 2023 17:05:01 +0200
Subject: [PATCH] journalwatch config

---
 modules/journalwatch.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index e52b4a2..06f3710 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -12,6 +12,8 @@
   #   echo 'hello' | systemd-cat -t someapp -p emerg
 
   # View Systemd Journal.
+  #   Output similar to dmesg
+  #     journalctl -b -k
   #   Filter by app:
   #     journalctl -b -t someapp
   #   Filter by priority:
@@ -54,7 +56,7 @@
           # Ignore any invocation of sudo.
           .*
         '';
-        match = "_EXE = //nix/store/[a-z0-9]+-sudo-[0-9]+.[0-9]+.[0-9]+[a-z0-9]+/bin/sudo/";
+        match = "_EXE = //nix/store/[a-z0-9]+-sudo-[0-9]+\.[0-9]+\.[0-9]+[a-z0-9]+/bin/sudo/";
       }
 
       #
@@ -200,12 +202,13 @@
           random: crng reseeded on system resumption
           random: crng init done
           # Ignore.
-          sd [0-9]:0:0:0: \[sda\] [0-9]+ 512-byte logical blocks: \([0-9]+ GB/[0-9]+ (GiB|TiB)\)
-          sd [0-9]:0:0:0: \[sda\] [0-9]-byte physical blocks
-          sd [0-9]:0:0:0: \[sda\] Write Protect is off
-          sd [0-9]:0:0:0: \[sda\] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
-          sd [0-9]:0:0:0: \[sda\] Optimal transfer size [0-9]+ bytes not a multiple of preferred minimum block size ([0-9] bytes)
-          sd [0-9]:0:0:0: \[sda\] Attached SCSI disk
+          sd [0-9]:0:0:0: \[sd[a-z]\] [0-9]+ 512-byte logical blocks: \([0-9]+ GB/[0-9]+ (GiB|TiB)\)
+          sd [0-9]:0:0:0: \[sd[a-z]\] [0-9]-byte physical blocks
+          sd [0-9]:0:0:0: \[sd[a-z]\] Write Protect is off
+          sd [0-9]:0:0:0: \[sd[a-z]\] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
+          sd [0-9]:0:0:0: \[sd[a-z]\] Optimal transfer size [0-9]+ bytes not a multiple of preferred minimum block size ([0-9] bytes)
+          sd [0-9]:0:0:0: \[sd[a-z]\] Attached SCSI disk
+          sd [0-9]:0:0:0: \[sd[a-z]\] Synchronizing SCSI cache
           #
           # YodaTab
           #
@@ -221,7 +224,10 @@
           Bridge firewalling registered
           SCSI subsystem initialized
           scsi [0-9]:0:0:0: Direct-Access\s+ATA.+PQ: 0 ANSI: 5
+          scsi [0-9]:0:0:0: Direct-Access.+PQ: 0 ANSI: 6
           thinkpad_acpi: Disabling thinkpad-acpi brightness events by default\.\.\.
+          VFS: Disk quotas dquot_[0-9]\.[0-9]\.[0-9]
+          ata1\.00: supports DRM functions and may not be fully accessible
           #
           done\.
         '';