diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix
index cb99b2a..69e7588 100644
--- a/nixos/gorgon/configuration.nix
+++ b/nixos/gorgon/configuration.nix
@@ -261,7 +261,7 @@ in
   xdg.portal.wlr.enable = false;
   hardware.bluetooth.enable = true;
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
       vaapiVdpau
diff --git a/nixos/modules/steam.nix b/nixos/modules/steam.nix
index b6b0846..e14add3 100644
--- a/nixos/modules/steam.nix
+++ b/nixos/modules/steam.nix
@@ -15,11 +15,8 @@ in
     };
   };
   config = mkIf cfg.enable {
-    nixpkgs.config.allowUnfree = true;
-
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
-      driSupport32Bit = true;
       extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
     };
 
diff --git a/nixos/modules/yubikey.nix b/nixos/modules/yubikey.nix
index 4be4492..47699e1 100644
--- a/nixos/modules/yubikey.nix
+++ b/nixos/modules/yubikey.nix
@@ -34,7 +34,7 @@ in
       };
       u2f = {
         control = "sufficient";
-        cue = true;
+        settings.cue = true;
       };
     };
 
diff --git a/nixos/ninurta/configuration.nix b/nixos/ninurta/configuration.nix
index 47c0103..d4a7bb9 100644
--- a/nixos/ninurta/configuration.nix
+++ b/nixos/ninurta/configuration.nix
@@ -270,14 +270,10 @@ in
         linkConfig.RequiredForOnline = false;
         routes = [
           {
-            routeConfig = {
-              Destination = "10.3.3.1/24";
-            };
+            Destination = "10.3.3.1/24";
           }
           {
-            routeConfig = {
-              Destination = "fd42:9c3b:f96d:121::1/64";
-            };
+            Destination = "fd42:9c3b:f96d:121::1/64";
           }
         ];
       };
@@ -294,14 +290,10 @@ in
         linkConfig.RequiredForOnline = false;
         routes = [
           {
-            routeConfig = {
-              Destination = "10.11.0.0/22";
-            };
+            Destination = "10.11.0.0/22";
           }
           {
-            routeConfig = {
-              Destination = "fc00:1337:dead:beef::10.11.0.0/118";
-            };
+            Destination = "fc00:1337:dead:beef::10.11.0.0/118";
           }
         ];
       };
@@ -341,25 +333,21 @@ in
         };
         wireguardPeers = [
           {
-            wireguardPeerConfig = {
-              PublicKey = "KzL+PKlv4LktIqqTqC9Esw8dkSZN2qSn/vq76UHbOlY=";
-              AllowedIPs = [
-                "10.3.3.1/32"
-                "fd42:9c3b:f96d:121::1/128"
-              ];
-              PersistentKeepalive = 25;
-              Endpoint = "surgat.dadada.li:51235";
-            };
+            PublicKey = "KzL+PKlv4LktIqqTqC9Esw8dkSZN2qSn/vq76UHbOlY=";
+            AllowedIPs = [
+              "10.3.3.1/32"
+              "fd42:9c3b:f96d:121::1/128"
+            ];
+            PersistentKeepalive = 25;
+            Endpoint = "surgat.dadada.li:51235";
           }
           {
-            wireguardPeerConfig = {
-              PublicKey = "INfv++4R+Kd2jdh/3CooM70ZeeoN6aeU6mo+T4C8gWU=";
-              AllowedIPs = [
-                "10.3.3.2/32"
-                "fd42:9c3b:f96d:121::2/128"
-              ];
-              Endpoint = "192.168.101.1:51235";
-            };
+            PublicKey = "INfv++4R+Kd2jdh/3CooM70ZeeoN6aeU6mo+T4C8gWU=";
+            AllowedIPs = [
+              "10.3.3.2/32"
+              "fd42:9c3b:f96d:121::2/128"
+            ];
+            Endpoint = "192.168.101.1:51235";
           }
         ];
       };
@@ -373,17 +361,15 @@ in
         };
         wireguardPeers = [
           {
-            wireguardPeerConfig = {
-              PublicKey = "tuoiOWqgHz/lrgTcLjX+xIhvxh9jDH6gmDw2ZMvX5T8=";
-              AllowedIPs = [
-                "10.11.0.0/22"
-                "fc00:1337:dead:beef::10.11.0.0/118"
-                "192.168.178.0/23"
-              ];
-              PersistentKeepalive = 25;
-              PresharedKeyFile = config.age.secrets.${uwuPresharedKey}.path;
-              Endpoint = "53c70r.de:51820";
-            };
+            PublicKey = "tuoiOWqgHz/lrgTcLjX+xIhvxh9jDH6gmDw2ZMvX5T8=";
+            AllowedIPs = [
+              "10.11.0.0/22"
+              "fc00:1337:dead:beef::10.11.0.0/118"
+              "192.168.178.0/23"
+            ];
+            PersistentKeepalive = 25;
+            PresharedKeyFile = config.age.secrets.${uwuPresharedKey}.path;
+            Endpoint = "53c70r.de:51820";
           }
         ];
       };
@@ -443,7 +429,7 @@ in
     })
   ];
 
-  hardware.pulseaudio.enable = false;
+  services.pulseaudio.enable = false;
 
   environment.systemPackages = with pkgs; [
     smartmontools
diff --git a/nixos/surgat/configuration.nix b/nixos/surgat/configuration.nix
index 5cd9596..5ddef7f 100644
--- a/nixos/surgat/configuration.nix
+++ b/nixos/surgat/configuration.nix
@@ -74,12 +74,10 @@ in
           "2a01:4f8:c17:1d70::/64"
         ];
         routes = [
-          { routeConfig.Gateway = "fe80::1"; }
+          { Gateway = "fe80::1"; }
           {
-            routeConfig = {
-              Gateway = "172.31.1.1";
-              GatewayOnLink = true;
-            };
+            Gateway = "172.31.1.1";
+            GatewayOnLink = true;
           }
         ];
         linkConfig.RequiredForOnline = "routable";
@@ -95,19 +93,13 @@ in
         linkConfig.RequiredForOnline = "no";
         routes = [
           {
-            routeConfig = {
-              Destination = "10.3.3.3/24";
-            };
+            Destination = "10.3.3.3/24";
           }
           {
-            routeConfig = {
-              Destination = "fd42:9c3b:f96d:121::/64";
-            };
+            Destination = "fd42:9c3b:f96d:121::/64";
           }
           {
-            routeConfig = {
-              Destination = "fd42:9c3b:f96d:101::/64";
-            };
+            Destination = "fd42:9c3b:f96d:101::/64";
           }
         ];
       };
@@ -124,14 +116,12 @@ in
         };
         wireguardPeers = [
           {
-            wireguardPeerConfig = {
-              PublicKey = "Kw2HVRb1zeA7NAzBvI3UzmOj45VqM358EBuZWdlAUDE=";
-              AllowedIPs = [
-                "10.3.3.3/32"
-                "fd42:9c3b:f96d:121::3/128"
-                "fd42:9c3b:f96d:101:4a21:bff:fe3e:9cfe/128"
-              ];
-            };
+            PublicKey = "Kw2HVRb1zeA7NAzBvI3UzmOj45VqM358EBuZWdlAUDE=";
+            AllowedIPs = [
+              "10.3.3.3/32"
+              "fd42:9c3b:f96d:121::3/128"
+              "fd42:9c3b:f96d:101:4a21:bff:fe3e:9cfe/128"
+            ];
           }
         ];
       };