From 10f2f667620e81296761131e4f42b1ade7ca1503 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Wed, 20 Sep 2023 13:38:26 +0200
Subject: [PATCH] journalwatch config

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

diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index 77c0443..e042b70 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -62,12 +62,6 @@
         '';
         match = "_SYSTEMD_UNIT = sshd.service";
       }
-      { # yodaTux. If the user `yoda` runs a command with `sudo`.
-        filters = ''
-          \s+yoda : TTY=pts/7 ; PWD=/.+ ; USER=root ; COMMAND=/.+
-        '';
-        match = "SYSLOG_IDENTIFIER = sudo";
-      }
       { # yodaTux
         filters = ''
           The system will suspend now!
@@ -88,12 +82,6 @@
         '';
         match = "_SYSTEMD_UNIT = user@1000.service";
       }
-      { # yodaYoga
-        filters = ''
-          (finished )?switching to system configuration /nix/store/.+-nixos-system-.+-[0-9]+\.[0-9]+pre-git
-        '';
-        match = "SYSLOG_IDENTIFIER = nixos";
-      }
       { # yodaTux
         filters = ''
           Reloading rules
@@ -113,9 +101,31 @@
       }
       { # yodaTux
         filters = ''
-          .+ Setting AttentionNeeded to FALSE because EnsureCredentials\(\) succeded
+          Mounted /dev/\S+ at /\S+ on behalf of uid [0-9]+
+          Cleaning up mount point /\S+ \(device \S+ is not mounted\)
+          Unmounted /dev/\S+ on behalf of uid [0-9]+
+          Successfully sent SCSI command SYNCHRONIZE CACHE to /dev/\S+
+          Successfully sent SCSI command START STOP UNIT to /dev/\S+
+          Powered off /dev/\S+ - successfully wrote to sysfs path /sys/devices/\S+
         '';
-        match = "_SYSTEMD_USER_UNIT = dbus.service";
+        match = "_SYSTEMD_UNIT = udisks2.service";
+      }
+
+      #
+      # SYSLOG_IDENTIFIER
+      #
+
+      { # yodaTux. If the user `yoda` runs a command with `sudo`.
+        filters = ''
+          \s+yoda : TTY=pts/7 ; PWD=/.+ ; USER=root ; COMMAND=/.+
+        '';
+        match = "SYSLOG_IDENTIFIER = sudo";
+      }
+      { # yodaYoga
+        filters = ''
+          (finished )?switching to system configuration /nix/store/.+-nixos-system-.+-[0-9]+\.[0-9]+pre-git
+        '';
+        match = "SYSLOG_IDENTIFIER = nixos";
       }
       { # yodaTux
         filters = ''
@@ -134,6 +144,12 @@
           iwlwifi 0000:01:00.0: .*
           #
           random: crng reseeded on system resumption
+          #
+          sd 2:0:0:0: [sda] [0-9]+ 512-byte logical blocks: \([0-9]+ GB/[0-9]+ GiB\)
+          sd 2:0:0:0: [sda] Write Protect is off
+          sd 2:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA
+          sd 2:0:0:0: [sda] Optimal transfer size [0-9]+ bytes not a multiple of preferred minimum block size (4096 bytes)
+          sd 2:0:0:0: [sda] Attached SCSI disk
         '';
         match = "SYSLOG_IDENTIFIER = kernel";
       }
@@ -143,6 +159,17 @@
         '';
         match = "SYSLOG_IDENTIFIER = simple-scan";
       }
+
+      #
+      # _SYSTEMD_USER_UNIT
+      #
+
+      { # yodaTux
+        filters = ''
+          .+ Setting AttentionNeeded to FALSE because EnsureCredentials\(\) succeded
+        '';
+        match = "_SYSTEMD_USER_UNIT = dbus.service";
+      }
       { # yodaTux
         filters = ''
           .*