From 4e6dd9a4a1f34a08b8f59dac47d4b921490937c1 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 13 Nov 2023 23:33:35 +0100
Subject: [PATCH] nix/lib/config/options: remove net-combined

---
 config/default.nix         | 1 -
 nix/lib/config/options.nix | 5 -----
 nix/pkgs/default.nix       | 5 ++---
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/config/default.nix b/config/default.nix
index 691912d..800cd16 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -18,5 +18,4 @@ in
   # IP networks
   ++ lib.filesystem.listFilesRecursive ./net;
 
-  site.net-combined = concatMapAttrsRecursive (name: value: { inherit (value) hosts4 hosts6; }) config.site.net;
 }
diff --git a/nix/lib/config/options.nix b/nix/lib/config/options.nix
index b7ae0cb..c633f9e 100644
--- a/nix/lib/config/options.nix
+++ b/nix/lib/config/options.nix
@@ -591,11 +591,6 @@ in
       type = with types; attrsOf (submodule netOpts);
     };
 
-    net-combined = mkOption {
-      description = "All hosts of all subnets";
-      default = {};
-      type = with types; submodule netOpts;
-    };
 
     hosts = mkOption {
       description = "All the static hosts";
diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix
index 11ebae6..220eecc 100644
--- a/nix/pkgs/default.nix
+++ b/nix/pkgs/default.nix
@@ -10,12 +10,11 @@ let
     nixpkgs.lib.generators.toPretty {} self.lib.openwrtModels
   );
   export-config = pkgs.writeText "config.nix" (
-    nixpkgs.lib.generators.toPretty {} (lib.filterAttrsRecursive (n: v: n != "net-combined") (
+    nixpkgs.lib.generators.toPretty {} (
       config
       //
       { site.dns.localZones = self.lib.dns.localZones; }
-    ))
-  );
+    ));
 
   encrypt-secrets = pkgs.writeScriptBin "encrypt-secrets" ''
     #! ${pkgs.runtimeShell} -e