From 382e0a74af213206eccb9b6b1592c73ac59b16ba Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Tue, 5 Nov 2024 19:41:26 +0000
Subject: [PATCH 1/2] simplify peering

---
 peering.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/peering.nix b/peering.nix
index eea580f..f558200 100644
--- a/peering.nix
+++ b/peering.nix
@@ -103,7 +103,7 @@ in
                 PersistentKeepalive = mkIf (peer.subnet != host.subnet) cfg.persistentKeepalive;
               };
             })
-            (filterAttrs (name: peer: peer != host && (host.subnet == "internet" || canDirectPeer host peer)) hosts);
+            (filterAttrs (name: peer: peer != host && (canDirectPeer host peer || canDirectPeer peer host)) hosts);
       };
 
       networks."30-birdsong" = {

From ffe25bd95a49d6595edec6caa432703a48b7a8fd Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Tue, 5 Nov 2024 19:41:43 +0000
Subject: [PATCH 2/2] remove systemd.network.enable; this should be set
 separately

---
 peering.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/peering.nix b/peering.nix
index f558200..9be32f5 100644
--- a/peering.nix
+++ b/peering.nix
@@ -77,8 +77,6 @@ in
     networking.firewall.allowedUDPPorts = mkIf cfg.openPorts [ host.port ];
 
     systemd.network = {
-      enable = true;
-
       netdevs."30-birdsong" = {
         netdevConfig = {
           Name = cfg.interface;