Merge branch 'compat-24.11'

See https://github.com/NixOS/nixpkgs/pull/312472.

This nixpkgs PR (targeting 24.11) broke merging of attributes in the
deprecated attrset. As the deprecated attrset is likely to be removed
altogether soon, instead of reporting upstream, and all our >24.05
systems are in randomcat's repo for now, we judged that the course of
least resistance was just to patch the config on a separate branch
until 24.11 is released.

peering.nix

@@ -93,13 +93,11 @@ in
           in
           mapAttrsToList
             (name: peer: {
-              wireguardPeerConfig = {
-                PublicKey = peer.wireguardKey;
-                AllowedIPs = [ peer.ipv4 peer.ipv6 ]
-                  ++ optionals peer.isRouter [ "10.127.0.0/16" "fd70:81ca:0f8f::/48" ];
-                Endpoint = mkIf (canDirectPeer host peer) "${peer.endpoint}:${toString peer.port}";
-                PersistentKeepalive = mkIf (peer.subnet != host.subnet) cfg.persistentKeepalive;
-              };
+              PublicKey = peer.wireguardKey;
+              AllowedIPs = [ peer.ipv4 peer.ipv6 ]
+                ++ optionals peer.isRouter [ "10.127.0.0/16" "fd70:81ca:0f8f::/48" ];
+              Endpoint = mkIf (canDirectPeer host peer) "${peer.endpoint}:${toString peer.port}";
+              PersistentKeepalive = mkIf (peer.subnet != host.subnet) cfg.persistentKeepalive;
             })
             (filterAttrs (name: peer: peer != host && (canDirectPeer host peer || canDirectPeer peer host)) hosts);
       };