WIP: router: mega modularization

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750650909,
+        "lastModified": 1749178927,
-        "narHash": "sha256-HRNJuqo15PRKezyBjhNf2Tjj05EcSJ8q6xJyDDbmDXE=",
+        "narHash": "sha256-bXcEx1aZUNm5hMLVJeuofcOrZyOiapzvQ7K36HYK3YQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "520fc4b50af1b365014c3748c126d3f52edb2f3b",
+        "rev": "91287a0e9d42570754487b7e38c6697e15a9aab2",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750506804,
+        "lastModified": 1748929857,
-        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
+        "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
+        "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
         "type": "github"
       },
       "original": {

flake.nix

@@ -37,19 +37,6 @@
       # Optionally, use home-manager.extraSpecialArgs to pass
       # arguments to home.nix
     };
-
-    mkRouter = hostFile: nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules = [
-        secrix.nixosModules.default
-        ./modules
-        ./modules/router
-        ./hosts/common.nix
-        hostFile
-        ./users/cazzzer
-        (hmModule ./home/common.nix)
-      ];
-    };
   in
   {
     apps.x86_64-linux.secrix = secrix.secrix self;
@@ -90,9 +77,17 @@
           (hmModule ./home/cazzzer-pc.nix)
         ];
       };
-      router = mkRouter ./hosts/router;
+      router = nixpkgs.lib.nixosSystem {
-      router-1 = mkRouter ./hosts/router-1;
+        system = "x86_64-linux";
-      router-2 = mkRouter ./hosts/router-2;
+        modules = [
+          secrix.nixosModules.default
+          ./modules
+          ./hosts/common.nix
+          ./hosts/router
+          ./users/cazzzer
+          (hmModule ./home/common.nix)
+        ];
+      };
     };
     # https://github.com/nix-community/nixos-generators?tab=readme-ov-file#using-in-a-flake
     packages.x86_64-linux = {

hosts/router-1/default.nix

@@ -1,24 +0,0 @@
-{
-  imports = [
-    ../hw-vm.nix
-  ];
-
-  router = {
-    enableDesktop = false;
-    enableDhcpClient = false;
-    wanMAC = "bc:24:11:af:bd:84";
-    lanMAC = "bc:24:11:38:b1:91";
-    wanLL = "fe80::be24:11ff:feaf:bd84";
-    lanLL = "fe80::be24:11ff:fe38:b191";
-    defaultToken = 251;
-
-    pdFromWan = "fd46:fbbe:ca55:100";
-    wanAddr4 = "192.168.1.63";
-    wanGw4 = "192.168.1.254";
-  };
-
-  networking.hostName = "grouty";
-
-  # override hw-vm.nix default
-  networking.useDHCP = false;
-}

hosts/router-2/default.nix

@@ -1,24 +0,0 @@
-{
-  imports = [
-    ../hw-vm.nix
-  ];
-
-  router = {
-    enableDesktop = false;
-    enableDhcpClient = false;
-    wanMAC = "bc:24:11:bc:db:c1";
-    lanMAC = "bc:24:11:19:2a:96";
-    wanLL = "fe80::be24:11ff:febc:dbc1";
-    lanLL = "fe80::be24:11ff:fe19:2a96";
-    defaultToken = 252;
-
-    pdFromWan = "fd46:fbbe:ca55:100";
-    wanAddr4 = "192.168.1.64";
-    wanGw4 = "192.168.1.254";
-  };
-
-  networking.hostName = "grouta";
-
-  # override hw-vm.nix default
-  networking.useDHCP = false;
-}

hosts/router/default.nix

@@ -1,18 +1,16 @@
 {
   imports = [
+    ../../modules/router
     ./hardware-configuration.nix
     ./private.nix
   ];
 
   router = {
     enableDesktop = false;
-    enableDhcpClient = true;
     wanMAC = "bc:24:11:4f:c9:c4";
     lanMAC = "bc:24:11:83:d8:de";
     wanLL = "fe80::be24:11ff:fe4f:c9c4";
     lanLL = "fe80::be24:11ff:fe83:d8de";
     defaultToken = 1;
   };
-
-  networking.hostName = "grouter";
 }

modules/router/default.nix

@@ -30,6 +30,8 @@ in
   boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
   boot.growPartition = true;
 
+  networking.hostName = "grouter";
+
   # Enable the X11 windowing system.
   # You can disable this if you're only using the Wayland session.
   services.xserver.enable = false;

modules/router/dns.nix

@@ -80,8 +80,6 @@ in
       "|etappi.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.12"
       "|etappi.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::12:1"
 
-      "|hass.${domain}^$dnsrewrite=${ifs.lan.ulaAddr}"
-
       # Lab DNS rewrites
       "||lab.${domain}^$dnsrewrite=etappi.${sysdomain}"
 

modules/router/ifconfig.nix

@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.router;
   vars = import ./vars.nix config;
   links = vars.links;
   ifs = vars.ifs;
@@ -58,7 +57,7 @@ in
   # https://github.com/systemd/systemd/issues/22571
   # https://github.com/systemd/systemd/issues/22571#issuecomment-2094905496
   # https://gist.github.com/csamsel/0f8cca3b2e64d7e4cc47819ec5ba9396
-  networking.dhcpcd.enable = cfg.enableDhcpClient;
+  networking.dhcpcd.enable = true;
   networking.dhcpcd.allowInterfaces = [ ifs.wan.name ];
   networking.dhcpcd.extraConfig = ''
     debug

modules/router/opts.nix

@@ -8,36 +8,30 @@ with lib;
       enableDesktop = mkOption {
         type = types.bool;
         default = false;
-        description = "Enable desktop environment for debugging";
+        description = "Enable desktop environment";
-      };
-
-      enableDhcpClient = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable DHCP client (should only be set on the main router)";
       };
 
       wanMAC = mkOption {
         type = types.str;
-        example = "bc:24:11:4f:c9:c4";
+        default = "bc:24:11:4f:c9:c4";
         description = "WAN interface MAC address";
       };
 
       lanMAC = mkOption {
         type = types.str;
-        example = "bc:24:11:83:d8:de";
+        default = "bc:24:11:83:d8:de";
         description = "LAN interface MAC address";
       };
 
       wanLL = mkOption {
           type = types.str;
-          example = "fe80::be24:11ff:fe4f:c9c4";
+          default = "fe80::be24:11ff:fe4f:c9c4";
           description = "WAN IPv6 link-local address";
       };
 
       lanLL = mkOption {
           type = types.str;
-          example = "fe80::be24:11ff:fe83:d8de";
+          default = "fe80::be24:11ff:fe83:d8de";
           description = "LAN IPv6 link-local address";
       };
 
@@ -49,20 +43,17 @@ with lib;
 
       wanAddr4 = mkOption {
         type = types.str;
-        example = "192.168.1.61";
         description = "WAN IPv4 address";
       };
 
       wanGw4 = mkOption {
         type = types.str;
-        example = "192.168.1.254";
         description = "WAN IPv4 gateway";
       };
 
       pdFromWan = mkOption {
         type = types.str;
-        example = "2001:db8:0:000";
+        description = "IPv6 prefix delegation from WAN";
-        description = "IPv6 prefix delegation from ISP (/60)";
       };
     };
   };

modules/router/services.nix

@@ -58,17 +58,14 @@ in
     enable = true;
     package = pkgs.caddy.withPlugins {
       plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-      hash = "sha256-2D7dnG50CwtCho+U+iHmSj2w14zllQXPjmTHr6lJZ/A=";
+      hash = "sha256-Gsuo+ripJSgKSYOM9/yl6Kt/6BFCA6BuTDvPdteinAI=";
     };
-    virtualHosts."*.${domain}".extraConfig = ''
+    virtualHosts."grouter.${domain}".extraConfig = ''
       encode
       tls {
           dns cloudflare {env.CF_API_KEY}
           resolvers 1.1.1.1
       }
-
-      @grouter host grouter.${domain}
-      handle @grouter {
       @grafana path /grafana /grafana/*
       handle @grafana {
           reverse_proxy localhost:${toString config.services.grafana.settings.server.http_port}
@@ -83,12 +80,6 @@ in
       handle /* {
           reverse_proxy localhost:${toString config.services.glance.settings.server.port}
       }
-      }
-
-      @hass host hass.${domain}
-      handle @hass {
-          reverse_proxy homeassistant.4.lab.l.cazzzer.com:8123
-      }
     '';
   };
 }

modules/router/vars.nix

@@ -77,7 +77,7 @@ rec {
       p4_ = "${p4}.20";                  # .0/24
       p6_ = "${pdFromWan}0";             # ::/64 managed by Att box
       ulaPrefix_ = "${ulaPrefix}:0020";  # ::/64
-      ip6Token_ = "::1:${toString cfg.defaultToken}";  # override ipv6 for lan20, since the Att box uses ::1 here
+      ip6Token_ = "::1:1";  # override ipv6 for lan20, since the Att box uses ::1 here
     };
     lan30 = mkIfConfig {
       name_ = "${lan.name}.30";

users/cazzzer/default.nix

@@ -5,7 +5,7 @@
     isNormalUser = true;
     description = "Yura";
     group = "cazzzer";
-    extraGroups = [ "wheel" "dialout" ]
+    extraGroups = [ "wheel" ]
       ++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ]
       ++ lib.optionals config.virtualisation.docker.enable [ "docker" ]
       ++ lib.optionals config.programs.wireshark.enable [ "wireshark" ]