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,91 @@
+{ config, lib, pkgs, ... }:
+let
+  vars = import ./vars.nix;
+  enableDesktop = false;
+in
 {
-  imports = [
+  imports =
-    ./hardware-configuration.nix
+    [ # Include the results of the hardware scan.
-    ./private.nix
+      ./hardware-configuration.nix
+      ./ifconfig.nix
+      ./wireguard.nix
+      ./firewall.nix
+      ./dns.nix
+      ./kea.nix
+      ./glance.nix
+      ./services.nix
+    ];
+  # Secrix for secrets management
+  secrix.hostPubKey = vars.pubkey;
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = false;
+  boot.kernelParams = [
+    "sysrq_always_enabled=1"
   ];
 
-  router = {
+  boot.loader.timeout = 2;
-    enableDesktop = false;
+  boot.loader.systemd-boot.configurationLimit = 5;
-    enableDhcpClient = true;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
-    wanMAC = "bc:24:11:4f:c9:c4";
+  boot.growPartition = true;
-    lanMAC = "bc:24:11:83:d8:de";
-    wanLL = "fe80::be24:11ff:fe4f:c9c4";
-    lanLL = "fe80::be24:11ff:fe83:d8de";
-    defaultToken = 1;
-  };
 
   networking.hostName = "grouter";
+
+  # Enable the X11 windowing system.
+  # You can disable this if you're only using the Wayland session.
+  services.xserver.enable = false;
+
+  # Enable the KDE Plasma Desktop Environment.
+  # Useful for debugging with wireshark.
+  hardware.graphics.enable = true;
+  services.displayManager.sddm.enable = enableDesktop;
+  services.displayManager.sddm.wayland.enable = enableDesktop;
+  services.desktopManager.plasma6.enable = enableDesktop;
+  # No need for audio in VM
+  services.pipewire.enable = false;
+
+  # VM services
+  services.qemuGuest.enable = true;
+  services.spice-vdagentd.enable = true;
+
+  security.sudo.wheelNeedsPassword = false;
+
+  programs.firefox.enable = true;
+  programs.fish.enable = true;
+  programs.git.enable = true;
+  programs.neovim.enable = true;
+  programs.bat.enable = true;
+  programs.htop.enable = true;
+  programs.wireshark.enable = true;
+  programs.wireshark.package = pkgs.wireshark; # wireshark-cli by default
+
+  environment.systemPackages = with pkgs; [
+    dust
+    eza
+    fastfetch
+    fd
+    kdePackages.kate
+    ldns
+    lsof
+    micro
+    mpv
+    openssl
+    ripgrep
+    rustscan
+    starship
+    tealdeer
+    transcrypt
+    waypipe
+    whois
+    wireguard-tools
+  ];
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.11"; # Did you read the comment?
 }

hosts/router/dns.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  vars = import ./vars.nix config;
+  vars = import ./vars.nix;
   domain = vars.domain;
   ldomain = vars.ldomain;
   sysdomain = vars.sysdomain;

hosts/router/firewall.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  vars = import ./vars.nix config;
+  vars = import ./vars.nix;
   links = vars.links;
   ifs = vars.ifs;
   pdFromWan = vars.pdFromWan;

hosts/router/glance.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  vars = import ./vars.nix config;
+  vars = import ./vars.nix;
   domain = vars.domain;
 in
 {

hosts/router/ifconfig.nix

@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.router;
+  vars = import ./vars.nix;
-  vars = import ./vars.nix config;
   links = vars.links;
   ifs = vars.ifs;
   pdFromWan = vars.pdFromWan;
@@ -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

hosts/router/kea.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  vars = import ./vars.nix config;
+  vars = import ./vars.nix;
   ldomain = vars.ldomain;
   ifs = vars.ifs;
 

hosts/router/private.nix

@@ -1,3 +1,3 @@
-U2FsdGVkX1+eMFkQxarJDGLkX0zXyMRPukeRNvzd/BJ0XDAUZ2EeZvQnZw8U53Xz
+U2FsdGVkX1/MGwxIMmhbZuPqJUZzex9v5tTuiOrEvDVldI7xY0edUy9Ii5udFLXt
-W97X4rvT+K/NQ7FVCYfOg1XpQhzlSiC9z1M4WLmPRutUgsDY5n5RFJu2R8K5DAfi
+AbxShsH43FH1ucgygKDlKTB/yXZWDoDVhjdgLFjaBtAt0xyAL9Doet844oDVhbbO
-sAPcxiQUGVKrmDUva16yNqoR2Dkx2XE9iW1hpkfGFYVUK+QKIBkUEowQQlJJ1Wg1
+FqOwXHMd+PE23rgqiCscsA==

hosts/router/services.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  vars = import ./vars.nix config;
+  vars = import ./vars.nix;
   domain = vars.domain;
 in
 {

hosts/router/vars.nix

@@ -1,6 +1,6 @@
-config:
 let
-  cfg = config.router;
+  private = import ./private.nix;
+
   mkIfConfig = {
     name_,
     domain_,
@@ -10,7 +10,7 @@ let
     p6Size_ ? 64,
     ulaPrefix_,  # /64
     ulaSize_ ? 64,
-    token? cfg.defaultToken,
+    token? 1,
     ip6Token_? "::${toString token}",
     ulaToken_? "::${toString token}",
     }: rec {
@@ -41,21 +41,21 @@ rec {
   ldomain = "l.${domain}";
   sysdomain = "sys.${domain}";
   links = {
-    wanMAC = cfg.wanMAC;
+    wanMAC = "bc:24:11:4f:c9:c4";
-    lanMAC = cfg.lanMAC;
+    lanMAC = "bc:24:11:83:d8:de";
-    wanLL = cfg.wanLL;
+    wanLL = "fe80::be24:11ff:fe4f:c9c4";
-    lanLL = cfg.lanLL;
+    lanLL = "fe80::be24:11ff:fe83:d8de";
   };
 
   p4 = "10.17";                      # .0.0/16
-  pdFromWan = cfg.pdFromWan;         # ::/60
+  pdFromWan = private.pdFromWan;  # ::/60
   ulaPrefix = "fdab:07d3:581d";      # ::/48
   ifs = rec {
     wan = rec {
       name = "wan";
-      addr4 = cfg.wanAddr4;
+      addr4 = private.wanAddr4;
-      addr4Sized = "${addr4}/24";
+      addr4Sized = "${addr4}/23";
-      gw4 = cfg.wanGw4;
+      gw4 = private.wanGw4;
     };
     lan = mkIfConfig {
       name_ = "lan";
@@ -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";

hosts/router/wireguard.nix

@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 let
-  vars = import ./vars.nix config;
+  vars = import ./vars.nix;
   wg0 = vars.ifs.wg0;
 
   peerIps = ifObj: token: [

modules/router/default.nix

@@ -1,91 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  vars = import ./vars.nix config;
-  enableDesktop = config.router.enableDesktop;
-in
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./opts.nix
-      ./ifconfig.nix
-      ./wireguard.nix
-      ./firewall.nix
-      ./dns.nix
-      ./kea.nix
-      ./glance.nix
-      ./services.nix
-    ];
-  # Secrix for secrets management
-  secrix.hostPubKey = vars.pubkey;
-
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = false;
-  boot.kernelParams = [
-    "sysrq_always_enabled=1"
-  ];
-
-  boot.loader.timeout = 2;
-  boot.loader.systemd-boot.configurationLimit = 5;
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
-  boot.growPartition = true;
-
-  # Enable the X11 windowing system.
-  # You can disable this if you're only using the Wayland session.
-  services.xserver.enable = false;
-
-  # Enable the KDE Plasma Desktop Environment.
-  # Useful for debugging with wireshark.
-  hardware.graphics.enable = true;
-  services.xserver.desktopManager.xfce.enable = enableDesktop;
-  services.xserver.desktopManager.xfce.enableWaylandSession = enableDesktop;
-  # services.displayManager.sddm.enable = enableDesktop;
-  # services.displayManager.sddm.wayland.enable = enableDesktop;
-  # services.desktopManager.plasma6.enable = enableDesktop;
-  # No need for audio in VM
-  services.pipewire.enable = false;
-
-  # VM services
-  services.qemuGuest.enable = true;
-  services.spice-vdagentd.enable = true;
-
-  security.sudo.wheelNeedsPassword = false;
-
-  programs.firefox.enable = true;
-  programs.fish.enable = true;
-  programs.git.enable = true;
-  programs.neovim.enable = true;
-  programs.bat.enable = true;
-  programs.htop.enable = true;
-  programs.wireshark.enable = true;
-  programs.wireshark.package = pkgs.wireshark; # wireshark-cli by default
-
-  environment.systemPackages = with pkgs; [
-    dust
-    eza
-    fastfetch
-    fd
-    kdePackages.kate
-    ldns
-    lsof
-    micro
-    mpv
-    openssl
-    ripgrep
-    rustscan
-    starship
-    tealdeer
-    transcrypt
-    waypipe
-    whois
-    wireguard-tools
-  ];
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
-}

modules/router/opts.nix

@@ -1,69 +0,0 @@
-{ lib, config, ... }:
-
-with lib;
-
-{
-  options = {
-    router = {
-      enableDesktop = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable desktop environment for debugging";
-      };
-
-      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";
-        description = "WAN interface MAC address";
-      };
-
-      lanMAC = mkOption {
-        type = types.str;
-        example = "bc:24:11:83:d8:de";
-        description = "LAN interface MAC address";
-      };
-
-      wanLL = mkOption {
-          type = types.str;
-          example = "fe80::be24:11ff:fe4f:c9c4";
-          description = "WAN IPv6 link-local address";
-      };
-
-      lanLL = mkOption {
-          type = types.str;
-          example = "fe80::be24:11ff:fe83:d8de";
-          description = "LAN IPv6 link-local address";
-      };
-
-      defaultToken = mkOption {
-        type = types.int;
-        default = 1;
-        description = "Default token for interface addressing";
-      };
-
-      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 ISP (/60)";
-      };
-    };
-  };
-}