From b8b499543316eeb160a07119b085287f29b04ce1 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 9 Nov 2021 21:07:37 +0100
Subject: [PATCH] pkgs/ap: delete unused networks

---
 nix/pkgs/ap.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/nix/pkgs/ap.nix b/nix/pkgs/ap.nix
index ae984f5..9a31ede 100644
--- a/nix/pkgs/ap.nix
+++ b/nix/pkgs/ap.nix
@@ -160,7 +160,7 @@ in ''
   '') config.site.sshPubKeys}
 
   # System configuration
-  ${uciDeleteAll "switch.@switch_vlan"}
+  ${uciDeleteAll "network.@switch_vlan"}
   ${uciDeleteAll "wireless.@wifi"}
 
   uci batch <<__UCI__
@@ -169,13 +169,6 @@ in ''
   set system.@system[0].log_ip=${config.site.net.mgmt.hosts4.logging}
   set system.@system[0].log_proto=udp
 
-  delete network.globals.ula_prefix
-  delete network.lan
-  delete network.wan
-  delete network.wan6
-  delete wireless.default_radio0
-  delete wireless.default_radio1
-
   # Switch config
   ${optionalString hasSwitch ''
     # Ports ${portsDoc}
@@ -214,6 +207,14 @@ in ''
   add_list network.mgmt.dns=${config.site.net.serv.hosts4.dnscache}
   add_list network.mgmt.dns=${config.site.net.serv.hosts6.dn42.dnscache}
 
+  delete network.globals.ula_prefix
+  # delete unused networks
+  ${concatMapStrings (net:
+    lib.optionalString (! hostConfig.interfaces ? ${net}) ''
+      delete network.${net}
+    ''
+  ) ([ "lan" "wan" "wan6" ] ++ builtins.attrNames config.site.net)}
+
   # bridged networks
   ${concatMapStrings (net:
     let
@@ -227,6 +228,8 @@ in ''
     '') (builtins.attrNames hostConfig.interfaces)
    }
 
+  delete wireless.default_radio0
+  delete wireless.default_radio1
   ${concatStrings (imap0 (index: path:
     let
       radioConfig = hostConfig.wifi.${path};
@@ -234,7 +237,6 @@ in ''
                  then "wlan2"
                  else "wlan5";
     in ''
-      set wireless.radio${toString index}=wifi-device
       set wireless.radio${toString index}=wifi-device
       set wireless.radio${toString index}.type=mac80211
       set wireless.radio${toString index}.country=DE