diff --git a/flake.nix b/flake.nix index bfba84f..c8dbc3f 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,19 @@ # 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; @@ -77,17 +90,9 @@ (hmModule ./home/cazzzer-pc.nix) ]; }; - 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 = mkRouter ./hosts/router; + router-1 = mkRouter ./hosts/router-1; + router-2 = mkRouter ./hosts/router-2; }; # https://github.com/nix-community/nixos-generators?tab=readme-ov-file#using-in-a-flake packages.x86_64-linux = { diff --git a/hosts/router-1/default.nix b/hosts/router-1/default.nix new file mode 100644 index 0000000..a4dd062 --- /dev/null +++ b/hosts/router-1/default.nix @@ -0,0 +1,24 @@ +{ + 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; +} diff --git a/hosts/router-2/default.nix b/hosts/router-2/default.nix new file mode 100644 index 0000000..6672a17 --- /dev/null +++ b/hosts/router-2/default.nix @@ -0,0 +1,24 @@ +{ + 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; +} diff --git a/hosts/router/default.nix b/hosts/router/default.nix index 7b0423b..a370644 100644 --- a/hosts/router/default.nix +++ b/hosts/router/default.nix @@ -1,6 +1,5 @@ { imports = [ - ../../modules/router ./hardware-configuration.nix ./private.nix ];