diff --git a/SwarselSystems.org b/SwarselSystems.org
index 66cfd59..96861b1 100644
--- a/SwarselSystems.org
+++ b/SwarselSystems.org
@@ -4799,8 +4799,11 @@ Needed for control over system-wide privileges etc. Also I make sure that the ro
         pam.services = lib.mkIf (!minimal) {
           login.u2fAuth = true;
           sudo.u2fAuth = true;
-          swaylock.u2fAuth = true;
-          swaylock.fprintAuth = false;
+          sshd.u2fAuth = false;
+          swaylock = {
+            u2fAuth = true;
+            fprintAuth = false;
+          };
         };
         polkit.enable = lib.mkIf (!minimal) true;
 
@@ -13430,7 +13433,7 @@ The `extraConfig` section here CANNOT be reindented. This has something to do wi
           border-radius = 15;
           border-size = 1;
           default-timeout = 5000;
-          ignore-timeout = 1;
+          ignore-timeout = false;
           icons = 1;
           layer = "overlay";
           sort = "-time";
@@ -14983,11 +14986,11 @@ This service changes the screen hue at night. I am not sure if that really does
           enable = true;
           extraArgs = [
             "-W"
-            " Consider charging the battery"
+            "  Consider charging the battery"
             "-C"
-            " Battery is low; plug in charger now"
+            "  Battery is low; plug in charger now"
             "-D"
-            " Device will lose power in a few seconds"
+            "  Device will lose power in a few seconds"
             "-c"
             "10"
             "-d"
diff --git a/modules/home/common/batsignal.nix b/modules/home/common/batsignal.nix
index 49bf81f..a1e1b70 100644
--- a/modules/home/common/batsignal.nix
+++ b/modules/home/common/batsignal.nix
@@ -9,11 +9,11 @@ in
       enable = true;
       extraArgs = [
         "-W"
-        " Consider charging the battery"
+        "  Consider charging the battery"
         "-C"
-        " Battery is low; plug in charger now"
+        "  Battery is low; plug in charger now"
         "-D"
-        " Device will lose power in a few seconds"
+        "  Device will lose power in a few seconds"
         "-c"
         "10"
         "-d"
diff --git a/modules/home/common/mako.nix b/modules/home/common/mako.nix
index 45d7cfa..f1a1ea1 100644
--- a/modules/home/common/mako.nix
+++ b/modules/home/common/mako.nix
@@ -8,7 +8,7 @@
         border-radius = 15;
         border-size = 1;
         default-timeout = 5000;
-        ignore-timeout = 1;
+        ignore-timeout = false;
         icons = 1;
         layer = "overlay";
         sort = "-time";
diff --git a/modules/nixos/client/polkit.nix b/modules/nixos/client/polkit.nix
index 6d1129f..9eefb45 100644
--- a/modules/nixos/client/polkit.nix
+++ b/modules/nixos/client/polkit.nix
@@ -7,8 +7,11 @@
       pam.services = lib.mkIf (!minimal) {
         login.u2fAuth = true;
         sudo.u2fAuth = true;
-        swaylock.u2fAuth = true;
-        swaylock.fprintAuth = false;
+        sshd.u2fAuth = false;
+        swaylock = {
+          u2fAuth = true;
+          fprintAuth = false;
+        };
       };
       polkit.enable = lib.mkIf (!minimal) true;