fix(topology): work around network propagator not knowing about mkMerge

topology/README.md

@@ -1,3 +1,22 @@
+## TODO
+
+- macvtap interface type svg with small link
+- address port label render make newline capable (multiple port labels)
+- NAT indication
+- embed font globally, try removing satori embed?
+- network centric view as standalone
+- make rectpacking of childs
+
+- podman / docker harvesting
+- nixos-container extractor
+
+- disks (from disko) + render
+- impermanence render?
+- nixos nftables firewall render?
+
+- search todo and do
+- the network propagator based on options.nodes cannot deal with mkMerge and mkIf stuff currently
+
 ## Options
 
 ## Renderers

topology/nixos/extractors/kea.nix

@@ -29,6 +29,8 @@ in {
         cidrv4 = subnet;
       };
 
-      topology.self.interfaces = genAttrs interfaces (const {network = netName;});
+      # Do not use topology.self.interfaces here to prevent inclusion of a mkMerge which cannot be
+      # detected by the network propagator currently.
+      topology.nodes.${config.topology.id}.interfaces = genAttrs interfaces (const {network = netName;});
     };
 }

topology/topology/renderers/elk/default.nix

@@ -163,7 +163,7 @@
 
       # Edge in network-centric view
       (optionalAttrs (interface.network != null) (
-        mkEdge ("children.network." + idForInterface node interface.id) "children.network.children.net:${interface.network}.ports.default" false {
+        mkEdge ("children.network." + idForInterface node interface.id) "children.network.children.net:${interface.network}.ports.default" interface.virtual {
           style = pathStyleFromNetworkStyle config.networks.${interface.network}.style;
         }
       ))

topology/topology/renderers/svg/default.nix

@@ -1,19 +1,3 @@
-# TODO:
-# - macvtap interface type svg with small link
-# - address port label render make newline capable (multiple port labels)
-# - NAT indication
-# - embed font globally, try removing satori embed?
-# - network overview card (list all networks with name and cidr, legend style)
-# - network centric view as standalone
-# - split network layout or make rectpacking of childs
-# - more service info
-# - disks (from disko) + render
-# - impermanence render?
-# - nixos nftables firewall render?
-# - podman / docker harvesting
-# - systemd extractor remove cidr mask
-# - nixos-container extractor
-# - search todo and do
 {
   config,
   lib,