diff --git a/modules/paranoia/default.nix b/modules/paranoia/default.nix
index 72ff299a..56c64a1b 100644
--- a/modules/paranoia/default.nix
+++ b/modules/paranoia/default.nix
@@ -44,7 +44,7 @@ in {
     # fileSystems."/".options = [ "noexec" ];
 
     services.openssh = {
-      kbdInteractiveAuthentication = false;
+      settings.KbdInteractiveAuthentication = false;
       extraConfig = ''
         AllowTcpForwarding yes
         X11Forwarding no
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 69ada37a..7ab1237a 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -14,6 +14,7 @@ channels: final: prev: {
     (channels.master)
     factorio-headless
     paperless-ngx
+    waybar
     ;
 
   haskellPackages =
diff --git a/overlays/waybar.nix b/overlays/waybar.nix
deleted file mode 100644
index 109c27c6..00000000
--- a/overlays/waybar.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-channels: final: prev: {
-  waybar = channels.latest.waybar.overrideAttrs (oldAttrs: rec {
-    inherit (prev.sources.waybar-nvfetcher) version src;
-    mesonFlags = oldAttrs.mesonFlags ++ ["-Dcava=disabled"];
-  });
-}