flake.lock

@@ -16,6 +16,22 @@
         "type": "github"
       }
     },
+    "blocklist": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1773514984,
+        "narHash": "sha256-c6qB3i3wetKEp/uD+dR51v9Izbshhy+ECqi2K+1HSoc=",
+        "owner": "StevenBlack",
+        "repo": "hosts",
+        "rev": "24b12bd67d953a1afbfed3ae85c080b033b47c36",
+        "type": "github"
+      },
+      "original": {
+        "owner": "StevenBlack",
+        "repo": "hosts",
+        "type": "github"
+      }
+    },
     "comin": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -353,6 +369,7 @@
     "root": {
       "inputs": {
         "betterfox": "betterfox",
+        "blocklist": "blocklist",
         "comin": "comin",
         "disko": "disko",
         "dns": "dns",

flake.nix

@@ -80,6 +80,11 @@
       url = "github:iBigQ/radicale-birthday-calendar";
       flake = false;
     };
+
+    blocklist = {
+      url = "github:StevenBlack/hosts";
+      flake = false;
+    };
   };
 
   outputs =

modules/nixos/networking/default.nix

@@ -1,9 +1,40 @@
-{ config, lib, ... }:
 {
-  options.custom.networking.hostName = lib.mkOption {
+  config,
-    type = lib.types.nonEmptyStr;
+  lib,
-    default = config.networking.hostName;
+  allHosts,
-    readOnly = true;
+  ...
+}:
+let
+  cfg = config.custom.networking;
+in
+{
+  options.custom.networking = {
+    hostName = lib.mkOption {
+      type = lib.types.nonEmptyStr;
+      default = config.networking.hostName;
+      readOnly = true;
+    };
+
+    nodes = lib.mkOption {
+      type = lib.types.listOf lib.types.attrs;
+      default =
+        allHosts
+        |> lib.attrValues
+        |> lib.map (host: host.config.custom.networking)
+        |> lib.map (
+          node:
+          lib.removeAttrs node [
+            "nodes"
+            "peers"
+          ]
+        );
+      readOnly = true;
+    };
+    peers = lib.mkOption {
+      type = lib.types.listOf lib.types.attrs;
+      default = cfg.nodes |> lib.filter (node: node.hostName != cfg.hostName);
+      readOnly = true;
+    };
   };
 
   config = {

modules/nixos/services/nameservers/private.nix

@@ -33,9 +33,7 @@ let
           };
 
         nodeRecords =
-          allHosts
+          netCfg.nodes
-          |> lib.attrValues
-          |> lib.map (host: host.config.custom.networking)
           |> lib.map (node: {
             name = node.hostName;
             inherit (node.overlay) address;

modules/nixos/services/nebula/default.nix

@@ -10,10 +10,7 @@ let
   netCfg = config.custom.networking;
 
   lighthouses =
-    allHosts
+    netCfg.peers
-    |> lib.attrValues
-    |> lib.map (host: host.config.custom.networking)
-    |> lib.filter (node: node.hostName != netCfg.hostName)
     |> lib.filter (peer: peer.overlay.isLighthouse)
     |> lib.map (lighthouse: lighthouse.overlay.address);
 in

modules/nixos/web-services/scrutiny.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, ... }:
-  config,
-  self,
-  lib,
-  ...
-}:
 let
   cfg = config.custom.web-services.scrutiny;
 in
@@ -21,11 +16,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    assertions = lib.singleton {
-      assertion = self.lib.isPrivateDomain cfg.domain;
-      message = self.lib.mkUnprotectedMessage "Scrutiny";
-    };
-
     services.scrutiny = {
       enable = true;
       settings.web.listen = {

modules/nixos/web-services/searxng.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, ... }:
-  config,
-  self,
-  lib,
-  ...
-}:
 let
   cfg = config.custom.web-services.searxng;
 in
@@ -21,11 +16,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    assertions = lib.singleton {
-      assertion = self.lib.isPrivateDomain cfg.domain;
-      message = self.lib.mkUnprotectedMessage "SearXNG";
-    };
-
     services.searx = {
       enable = true;
       settings = {