diff --git a/ops/nixos/bvm-paperless/default.nix b/ops/nixos/bvm-paperless/default.nix
index 58ffc3b69a..7a51471ee6 100644
--- a/ops/nixos/bvm-paperless/default.nix
+++ b/ops/nixos/bvm-paperless/default.nix
@@ -25,7 +25,7 @@ in {
   services.paperless = {
     enable = true;
     address = "[${config.my.ip.tailscale6}]";
-    extraConfig = {
+    settings = {
       PAPERLESS_URL = "https://paperless.int.lukegb.com";
       PAPERLESS_ALLOWED_HOSTS = "paperless.int.lukegb.com,bvm-paperless.int.as205479.net:28981,bvm-paperless.int.as205479.net";
       PAPERLESS_CORS_ALLOWED_HOSTS = "https://paperless.int.lukegb.com,http://bvm-paperless.int.as205479.net:28981";
diff --git a/ops/nixos/laputa/default.nix b/ops/nixos/laputa/default.nix
index c8c656fd28..1c61b887b9 100644
--- a/ops/nixos/laputa/default.nix
+++ b/ops/nixos/laputa/default.nix
@@ -109,7 +109,7 @@
   # Enable the X11 windowing system.
   services.xserver = {
     enable = true;
-    layout = "us";
+    xkb.layout = "us";
     libinput.enable = true;
     windowManager.i3.enable = true;
     videoDrivers = [ "modesetting" "fbdev" "intel" ];
diff --git a/ops/nixos/nausicaa/default.nix b/ops/nixos/nausicaa/default.nix
index fc27384a9f..0109eec829 100644
--- a/ops/nixos/nausicaa/default.nix
+++ b/ops/nixos/nausicaa/default.nix
@@ -162,7 +162,7 @@ in {
   # Enable the X11 windowing system.
   services.xserver = {
     enable = true;
-    layout = "us";
+    xkb.layout = "us";
     libinput.enable = true;
     windowManager.i3.enable = true;
     videoDrivers = [ "modesetting" ];
diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix
index 35c79bd8fb..bda453d45b 100644
--- a/ops/nixos/porcorosso/default.nix
+++ b/ops/nixos/porcorosso/default.nix
@@ -172,7 +172,7 @@ in {
   # Enable the X11 windowing system.
   services.xserver = {
     enable = true;
-    layout = "us";
+    xkb.layout = "us";
     libinput.enable = true;
     windowManager.i3.enable = true;
     videoDrivers = [ "nvidia" ];