nixos: Attempt to get LLDP working

nixos/boxes/colony.nix

@@ -62,7 +62,22 @@
               Name = "base";
               Kind = "bridge";
             };
-            networks."80-base" = networkdAssignment "base" assignments.internal;
+            networks = {
+              "80-base" = networkdAssignment "base" assignments.internal;
+              "80-vm-tap" = {
+                matchConfig = {
+                  # Don't think we have control over the name of the TAP from qemu-bridge-helper (or how to easily pick
+                  # which interface is which)
+                  Name = "tap*";
+                  Driver = "tun";
+                };
+                networkConfig = {
+                  KeepMaster = true;
+                  LLDP = true;
+                  EmitLLDP = "customer-bridge";
+                };
+              };
+            };
           };
 
           services."vm@estuary" = {

nixos/modules/server.nix

@@ -12,6 +12,7 @@ in
     services = {
       getty.autologinUser = mkDefault uname;
       kmscon.autologinUser = mkDefault uname;
+      resolved.llmnr = mkDefault "false";
     };
 
     my.user.homeConfig = {

nixos/vms/estuary.nix

@@ -16,7 +16,7 @@
 
     configuration = { lib, pkgs, modulesPath, config, systems, assignments, ... }:
       let
-        inherit (lib) mkIf mkMerge;
+        inherit (lib) mkIf mkMerge mkForce;
         inherit (lib.my) networkdAssignment;
       in
       {
@@ -70,19 +70,22 @@
                   matchConfig.Name = "wan";
                   DHCP = "ipv4";
                 };
-                "80-base" = (networkdAssignment "base" assignments.internal) // {
-                  networkConfig = {
-                    IPv6AcceptRA = false;
-                    IPv6SendRA = true;
-                    IPMasquerade = "both";
-                  };
-                  ipv6SendRAConfig.DNS = [ assignments.internal.ipv6.address ];
-                  ipv6Prefixes = [
-                    {
-                      ipv6PrefixConfig.Prefix = "2a0e:97c0:4d1:0::/64";
-                    }
-                  ];
-                };
+                "80-base" = mkMerge [
+                  (networkdAssignment "base" assignments.internal)
+                  {
+                    networkConfig = {
+                      IPv6AcceptRA = mkForce false;
+                      IPv6SendRA = true;
+                      IPMasquerade = "both";
+                    };
+                    ipv6SendRAConfig.DNS = [ assignments.internal.ipv6.address ];
+                    ipv6Prefixes = [
+                      {
+                        ipv6PrefixConfig.Prefix = "2a0e:97c0:4d1:0::/64";
+                      }
+                    ];
+                  }
+                ];
               };
             };