WIP: router: add configuration for test router

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,28 @@
           (hmModule ./home/cazzzer-pc.nix)
         ];
       };
-      router = mkRouter ./hosts/router;
-      router-1 = mkRouter ./hosts/router-1;
-      router-2 = mkRouter ./hosts/router-2;
+      router = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          secrix.nixosModules.default
+          ./modules
+          ./hosts/common.nix
+          ./hosts/router
+          ./users/cazzzer
+          (hmModule ./home/common.nix)
+        ];
+      };
+      router-1 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          secrix.nixosModules.default
+          ./modules
+          ./hosts/common.nix
+          ./hosts/router-1
+          ./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,5 +1,6 @@
 {
   imports = [
+    ../../modules/router
     ../hw-vm.nix
   ];
 

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,5 +1,6 @@
 {
   imports = [
+    ../../modules/router
     ./hardware-configuration.nix
     ./private.nix
   ];