feat(topology): render network addresses

modules/config/topology.nix

@@ -0,0 +1,3 @@
+{config, ...}: {
+  topology.id = config.node.name;
+}

modules/default.nix

@@ -24,6 +24,7 @@
     ./config/secrets.nix
     ./config/ssh.nix
     ./config/system.nix
+    ./config/topology.nix
     ./config/users.nix
 
     ./acme-wildcard.nix

topology/nixos/extractors/disko.nix

@@ -1,2 +0,0 @@
-{
-}

topology/nixos/extractors/network-interfaces.nix

@@ -1,2 +0,0 @@
-{
-}

topology/nixos/extractors/node.nix

@@ -1,2 +0,0 @@
-{
-}

topology/nixos/extractors/wireguard.nix

@@ -73,7 +73,7 @@ in {
             network = networkId wgName;
             virtual = true;
             physicalConnections = flip map connectedPeers (peer: {
-              node = peer;
+              node = inputs.self.nodes.${peer}.config.topology.id;
               interface = (wgCfgOf peer).linkName;
             });
           };

topology/options/interfaces.nix

@@ -89,7 +89,7 @@ in
             interface:
               [
                 {
-                  assertion = config.networks ? ${interface.network};
+                  assertion = interface.network != null -> config.networks ? ${interface.network};
                   message = "topology: nodes.${node.id}.interfaces.${interface.id} refers to an unknown network '${interface.network}'";
                 }
               ]

topology/topology/renderers/d2/network.nix

@@ -8,6 +8,7 @@
     (lib)
     attrValues
     concatLines
+    optionalString
     ;
 
   #toD2 = _nodeName: node: ''
@@ -29,25 +30,34 @@
   #'';
 
   netToD2 = net: ''
-    ${net.id}: |md
+    ${net.id}: ${net.name} {
-    # ${net.name}
+      info: |md
       ${net.cidrv4}
       ${net.cidrv6}
       |
+    }
   '';
 
-  nodeInterfaceToD2 = node: interface: ''
+  nodeInterfaceToD2 = node: interface:
-    ${node.id}.${interface.id}: |md
+    ''
-    ## ${interface.id}
+      ${node.id}.${interface.id}: ${interface.id} {
+        info: |md
+        ${toString interface.mac}
+        ${toString interface.addresses}
+        ${toString interface.gateways}
         |
-
+      }
-    ${node.id}.${interface.id} -> ${interface.network}
+    ''
+    + optionalString (interface.network != null) ''
+      ${node.id}.${interface.id} -- ${interface.network}
     '';
+  # TODO: deduplicate first
+  #+ concatLines (flip map interface.physicalConnections (x: ''
+  #  ${node.id}.${interface.id} -- ${x.node}.${x.interface}
+  #''));
 
   nodeToD2 = node: ''
-    ${node.id}: |md
+    ${node.id}: ${node.name} {}
-    # ${node.name}
-    |
 
     ${concatLines (map (nodeInterfaceToD2 node) (attrValues node.interfaces))}
   '';