diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix
index bd8b59a..1518579 100644
--- a/modules/journalwatch.nix
+++ b/modules/journalwatch.nix
@@ -38,68 +38,73 @@
     # `filters` are always regular expressions.
     # All regular expressions have to match the full string!
     filterBlocks = [
-     {
-       filters = ''
+      { # yodaTux
+        filters = ''
          .*
-       '';
-       match = "_SYSTEMD_UNIT = bluetooth.service";
-     }
-     {
-       filters = ''
-         .*
-       '';
-       match = "_SYSTEMD_UNIT = cups.service";
-     }
-     { # If the user `yoda` runs a command with `sudo`.
-       filters = ''
-         \s+yoda : TTY=pts/7 ; PWD=/.+ ; USER=root ; COMMAND=/.+
-       '';
-       match = "SYSLOG_IDENTIFIER = sudo";
-     }
-     {
-       filters = ''
-         The system will suspend now!
-       '';
-       match = "_SYSTEMD_UNIT = systemd-logind.service";
-     }
-     {
-       filters = ''
-         Reexecuting.
-         finished switching to system configuration /nix/store/.+-nixos-system-.+-[0-9]+\.[0-9]+pre-git
-       '';
-       match = "_SYSTEMD_UNIT = user@0.service";
-     }
-     {
-       filters = ''
-         Reexecuting.
-         finished switching to system configuration /nix/store/.+-nixos-system-.+-[0-9]+\.[0-9]+pre-git
-       '';
-       match = "_SYSTEMD_UNIT = user@1000.service";
-     }
-     {
-       filters = ''
-         Reloading rules
-         Collecting garbage unconditionally...
-         Loading rules from directory /.+
-         Finished loading, compiling and executing [0-9]+ rules
-       '';
-       match = "_SYSTEMD_UNIT = polkit.service";
-     }
-     { # yodaTux
-       filters = ''
-         .+ error name="org\.bluez\.MediaEndpoint1\.Error\.NotImplemented" .+
-       '';
-       match = "_SYSTEMD_USER_UNIT = dbus.service";
-     }
-     { # yodaTux
-       filters = ''
-         ACPI: FW issue: working around C-state latencies out of order
-         # Kernel WiFi driver bug.
-         iwlwifi 0000:01:00.0: Unhandled alg: 0x707
-
-       '';
-       match = "SYSLOG_IDENTIFIER = kernel";
-     }
+        '';
+        match = "_SYSTEMD_UNIT = bluetooth.service";
+      }
+      { # yodaTux
+        filters = ''
+          .*
+        '';
+        match = "_SYSTEMD_UNIT = cups.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!
+        '';
+        match = "_SYSTEMD_UNIT = systemd-logind.service";
+      }
+      { # yodaTux
+        filters = ''
+          Reexecuting.
+          finished switching to system configuration /nix/store/.+-nixos-system-.+-[0-9]+\.[0-9]+pre-git
+        '';
+        match = "_SYSTEMD_UNIT = user@0.service";
+      }
+      { # yodaTux
+        filters = ''
+          Reexecuting.
+          (finished )?switching to system configuration /nix/store/.+-nixos-system-.+-[0-9]+\.[0-9]+pre-git
+        '';
+        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
+          Collecting garbage unconditionally...
+          Loading rules from directory /.+
+          Finished loading, compiling and executing [0-9]+ rules
+        '';
+        match = "_SYSTEMD_UNIT = polkit.service";
+      }
+      { # yodaTux
+        filters = ''
+          .+ error name="org\.bluez\.MediaEndpoint1\.Error\.NotImplemented" .+
+        '';
+        match = "_SYSTEMD_USER_UNIT = dbus.service";
+      }
+      { # yodaTux
+        filters = ''
+          ACPI: FW issue: working around C-state latencies out of order
+          # Kernel WiFi driver bug.
+          iwlwifi 0000:01:00.0: Unhandled alg: 0x707
+        '';
+        match = "SYSLOG_IDENTIFIER = kernel";
+      }
    ];
   };
 }