WIP: router: add remaining VLANs, temporary network configs

Retiring OPNsense will take a while, in the meantime it should work together

flake.lock

@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1740432748,
+        "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "nixlib": {
       "locked": {
         "lastModified": 1736643958,
@@ -38,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738142207,
+        "lastModified": 1740367490,
-        "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
+        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
+        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
         "type": "github"
       },
       "original": {
@@ -52,10 +72,35 @@
         "type": "github"
       }
     },
+    "plasma-manager": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739557722,
+        "narHash": "sha256-XikzLpPUDYiNyJ4w2SfRShdbSkIgE3btYdxCGInmtc4=",
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "rev": "1f3e1f38dedbbb8aad77e184fb54ec518e2d9522",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "plasma-manager",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "home-manager": "home-manager",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "plasma-manager": "plasma-manager"
       }
     }
   },

flake.nix

@@ -5,13 +5,22 @@
     nixpkgs = {
       url = "github:NixOS/nixpkgs/nixos-unstable";
     };
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    plasma-manager = {
+      url = "github:nix-community/plasma-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, nixos-generators }: {
+  outputs = { self, nixpkgs, home-manager, plasma-manager, nixos-generators }: {
     nixosConfigurations = {
       Yura-PC = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -19,6 +28,17 @@
           ./modules
           ./hosts/common.nix
           ./hosts/Yura-PC
+          # https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
+
+            home-manager.users.cazzzer = import ./home;
+            # Optionally, use home-manager.extraSpecialArgs to pass
+            # arguments to home.nix
+          }
         ];
       };
       VM = nixpkgs.lib.nixosSystem {

home/default.nix

@@ -0,0 +1,148 @@
+{ config, pkgs, ... }:
+let
+  defaultFont = {
+    family = "Noto Sans";
+    pointSize = 14;
+  };
+in
+{
+  # Home Manager needs a bit of information about you and the paths it should
+  # manage.
+  home.username = "cazzzer";
+  home.homeDirectory = "/home/cazzzer";
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+
+  home.sessionVariables = {
+    EDITOR = "micro";
+    SHELL = "fish";
+  };
+
+  services.gnome-keyring = {
+    enable = true;
+    components = [ "pkcs11" "ssh" ];
+  };
+
+  services.darkman = {
+    enable = true;
+    settings = {
+      lat = 37.3387;
+      lng = -121.8853;
+    };
+    lightModeScripts = {
+      plasma-color = "plasma-apply-colorscheme BreezeLight";
+    };
+    darkModeScripts = {
+      plasma-color = "plasma-apply-colorscheme BreezeDark";
+    };
+  };
+
+  programs.plasma = {
+    enable = true;
+    overrideConfig = true;
+    workspace.iconTheme = "Tela-circle";
+    fonts = {
+      general = defaultFont;
+      fixedWidth = defaultFont // { family = "Hack"; };
+      small = defaultFont // { pointSize = defaultFont.pointSize - 2; };
+      toolbar = defaultFont;
+      menu = defaultFont;
+      windowTitle = defaultFont;
+    };
+    input.keyboard.layouts = [ { layout = "minimak-4"; displayName = "us4"; } ];
+    kwin.virtualDesktops.number = 2;
+    session.sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession";
+    shortcuts = {
+      # kmix.mic_mute = "ScrollLock";
+      kmix.mic_mute = ["Microphone Mute" "ScrollLock" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Mute Microphone"];
+      plasmashell.show-barcode = "Meta+M";
+      kwin."Window Maximize" = [ "Meta+F" "Meta+PgUp,Maximize Window" ];
+    };
+    hotkeys.commands."launch-konsole" = {
+      name = "Launch Konsole";
+      key = "Meta+Alt+C";
+      command = "konsole";
+    };
+    configFile = {
+      kdeglobals.KDE.AnimationDurationFactor = 0.5;
+      kdeglobals.General.accentColorFromWallpaper = true;
+      kwinrc.Wayland.InputMethod = {
+        value = "org.fcitx.Fcitx5.desktop";
+        shellExpand = true;
+      };
+      dolphinrc.General.ShowFullPath = true;
+      kactivitymanagerdrc = {
+        activities."809dc779-bf5b-49e6-8e3f-cbe283cb05b6" = "Default";
+        activities."b34a506d-ac4f-4797-8c08-6ef45bc49341" = "Fun";
+        activities-icons."809dc779-bf5b-49e6-8e3f-cbe283cb05b6" = "keyboard";
+        activities-icons."b34a506d-ac4f-4797-8c08-6ef45bc49341" = "preferences-desktop-gaming";
+      };
+    };
+  };
+
+  # This value determines the Home Manager release that your configuration is
+  # compatible with. This helps avoid breakage when a new Home Manager release
+  # introduces backwards incompatible changes.
+  #
+  # You should not change this value, even if you update Home Manager. If you do
+  # want to update the value, then make sure to first check the Home Manager
+  # release notes.
+  home.stateVersion = "24.11"; # Please read the comment before changing.
+
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
+  # home.packages = [
+    # # Adds the 'hello' command to your environment. It prints a friendly
+    # # "Hello, world!" when run.
+    # pkgs.hello
+
+    # # It is sometimes useful to fine-tune packages, for example, by applying
+    # # overrides. You can do that directly here, just don't forget the
+    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
+    # # fonts?
+    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+
+    # # You can also create simple shell scripts directly inside your
+    # # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
+  # ];
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  # home.file = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+  # };
+
+  # Home Manager can also manage your environment variables through
+  # 'home.sessionVariables'. These will be explicitly sourced when using a
+  # shell provided by Home Manager. If you don't want to manage your shell
+  # through Home Manager then you have to manually source 'hm-session-vars.sh'
+  # located at either
+  #
+  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  /etc/profiles/per-user/cazzzer/etc/profile.d/hm-session-vars.sh
+  #
+  # home.sessionVariables = {
+    # EDITOR = "emacs";
+  # };
+}

hosts/Yura-PC/default.nix

@@ -152,7 +152,6 @@
   virtualisation.docker.enable = true;
   virtualisation.docker.enableOnBoot = false;
   virtualisation.docker.package = pkgs.docker_27;
-  virtualisation.docker.storageDriver = "zfs";
 
   # https://discourse.nixos.org/t/firefox-does-not-use-kde-window-decorations-and-cursor/32132/3
   # programs.dconf.enable = true;
@@ -222,9 +221,10 @@
     gnome-keyring # config for this and some others
     gnumake
     helix
-    jetbrains-toolbox # or maybe do invidual ones?
     # jetbrains.rust-rover
+    # jetbrains.goland
     jetbrains.clion
+    jetbrains.idea-ultimate
     jetbrains.pycharm-professional
     jetbrains.webstorm
     android-studio
@@ -261,8 +261,8 @@
 
   # Open ports in the firewall.
   # networking.nftables.enable = true;
-  networking.firewall.allowedTCPPorts = [ 8080 ];
+  networking.firewall.allowedTCPPorts = [ 8080 22000 ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
+  networking.firewall.allowedUDPPorts = [ 22000 ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
 

hosts/router/default.nix

@@ -3,30 +3,157 @@ let
   domain = "cazzzer.com";
   ldomain = "l.${domain}";
 
-  if_wan = "wan";
+  mkIfConfig = {
-  if_lan = "lan";
+    name_,
-  if_lan10 = "lan.10";
+    domain_,
-  if_lan20 = "lan.20";
+    p4_,  # /24
+    p6_,  # /64
+    ulaPrefix_,  # /64
+    token? 1,
+    }: rec {
+      name = name_;
+      domain = domain_;
+      p4 = p4_;
+      p4Size = 24;
+      net4 = "${p4}.0/${toString p4Size}";
+      addr4 = "${p4}.${toString token}";
+      addr4Sized = "${addr4}/${toString p4Size}";
+      p6 = p6_;
+      p6Size = 64;
+      net6 = "${p6}::/${toString p6Size}";
+      ip6Token = "::${toString token}";
+      addr6 = "${p6}${ip6Token}";
+      addr6Sized = "${addr6}/${toString p6Size}";
+      ulaPrefix = ulaPrefix_;
+      ulaSize = 64;
+      ulaNet = "${ulaPrefix}::/${toString ulaSize}";
+      ulaAddr = "${ulaPrefix}${ip6Token}";
+      ulaAddrSized = "${ulaAddr}/${toString ulaSize}";
+    };
 
-  wan_ip4 = "192.168.1.61/24";
+  p4 = "10.17";                      # .0.0/16
-  wan_gw4 = "192.168.1.254";
+  pdFromWan = "";  # ::/60
+  ulaPrefix = "fdab:07d3:581d";      # ::/48
+  ifs = rec {
+    wan = rec {
+      name = "wan";
+      addr4 = "192.168.1.61";
+      addr4Sized = "${addr4}/24";
+      gw4 = "192.168.1.254";
+    };
+    lan = mkIfConfig {
+      name_ = "lan";
+      domain_ = "lan.${ldomain}";
+      p4_ = "${p4}.1";                   # .0/24
+      p6_ = "${pdFromWan}9";             # ::/64
+      ulaPrefix_ = "${ulaPrefix}:0001";  # ::/64
+    };
+    lan10 = mkIfConfig {
+      name_ = "${lan.name}.10";
+      domain_ = "lab.${ldomain}";
+      p4_ = "${p4}.10";                  # .0/24
+      p6_ = "${pdFromWan}a";             # ::/64
+      ulaPrefix_ = "${ulaPrefix}:0010";  # ::/64
+    };
+    lan20 = mkIfConfig {
+      name_ = "${lan.name}.20";
+      domain_ = "life.${ldomain}";
+      p4_ = "${p4}.20";                  # .0/24
+      p6_ = "${pdFromWan}2";             # ::/64
+      ulaPrefix_ = "${ulaPrefix}:0020";  # ::/64
+    };
+    lan30 = mkIfConfig {
+      name_ = "${lan.name}.30";
+      domain_ = "iot.${ldomain}";
+      p4_ = "${p4}.30";                  # .0/24
+      p6_ = "${pdFromWan}3";             # ::/64
+      ulaPrefix_ = "${ulaPrefix}:0030";  # ::/64
+    };
+    lan40 = mkIfConfig {
+      name_ = "${lan.name}.40";
+      domain_ = "kube.${ldomain}";
+      p4_ = "${p4}.40";                  # .0/24
+      p6_ = "${pdFromWan}4";             # ::/64
+      ulaPrefix_ = "${ulaPrefix}:0040";  # ::/64
+    };
+    lan50 = mkIfConfig {
+      name_ = "${lan.name}.50";
+      domain_ = "prox.${ldomain}";
+      p4_ = "${p4}.50";                  # .0/24
+      p6_ = "${pdFromWan}a";             # ::/64
+      ulaPrefix_ = "${ulaPrefix}:0050";  # ::/64
+    };
+  };
 
-  lan_p4 = "10.19.1"; # .0/24
+  mkVlanDev = { id, name }: {
-  lan10_p4 = "10.19.10"; # .0/24
+    netdevConfig = {
-  lan20_p4 = "10.19.20"; # .0/24
+      Kind = "vlan";
+      Name = name;
+    };
+    vlanConfig.Id = id;
+  };
 
-  pd_from_wan = ""; # ::/60
+  mkLanConfig = ifObj: {
-  lan_p6 = "${pd_from_wan}9"; # ::/64
+    matchConfig.Name = ifObj.name;
-  lan10_p6 = "${pd_from_wan}a"; # ::/64
+    networkConfig = {
-  lan20_p6 = "${pd_from_wan}2"; # ::/64
+      IPv4Forwarding = true;
+      IPv6SendRA = true;
+      Address = [ ifObj.addr4Sized ];
+    };
+    ipv6Prefixes = [
+      {
+        Prefix = ifObj.net6;
+        Assign = true;
+        # Token = [ "static::1" "eui64" ];
+        Token = [ "static:${ifObj.ip6Token}" ];
+      }
+      {
+        Prefix = ifObj.ulaNet;
+        Assign = true;
+        Token = [ "static:${ifObj.ip6Token}" ];
+      }
+    ];
+    ipv6SendRAConfig = {
+      Managed = true;
+      OtherInformation = true;
+      EmitDNS = true;
+      DNS = [ ifObj.ulaAddr ];
+    };
+  };
 
-  ula_p = "fdab:07d3:581d"; # ::/48
+  mkTempLanConfig = ifObj: {
-  lan_ula_p = "${ula_p}:0001"; # ::/64
+    matchConfig.Name = ifObj.name;
-  lan10_ula_p = "${ula_p}:0010"; # ::/64
+    networkConfig = {
-  lan20_ula_p = "${ula_p}:0020"; # ::/64
+      IPv4Forwarding = true;
-  lan_ula_addr = "${lan_ula_p}::1";
+      # IPv6SendRA = true;
-  lan10_ula_addr = "${lan10_ula_p}::1";
+      Address = [ "${ifObj.p4}.249/24" ];
-  lan20_ula_addr = "${lan20_ula_p}::1";
+      # IPv6AcceptRA = true;
+    };
+  };
+
+  mkDhcp4Subnet = id: ifObj: {
+    id = id;
+    subnet = ifObj.net4;
+    pools = [ { pool = "${ifObj.p4}.100 - ${ifObj.p4}.199"; } ];
+    ddns-qualifying-suffix = "4.${ifObj.domain}";
+    option-data = [
+      { name = "routers"; data = ifObj.addr4; }
+      { name = "domain-name-servers"; data = ifObj.addr4; }
+      { name = "domain-name"; data = "4.${ifObj.domain}"; }
+    ];
+  };
+
+  mkDhcp6Subnet = id: ifObj: {
+    id = id;
+    interface = ifObj.name;
+    subnet = ifObj.net6;
+    rapid-commit = true;
+    pools = [ { pool = "${ifObj.p6}::1:1000/116"; } ];
+    ddns-qualifying-suffix = "6.${ifObj.domain}";
+    option-data = [
+      { name = "domain-search"; data = "6.${ifObj.domain}"; }
+    ];
+  };
 in
 {
   imports =
@@ -41,11 +168,11 @@ in
     "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;
 
-  environment.etc.hosts.mode = "0644";
   networking.hostName = "grouter";
 
   # It is impossible to do multiple prefix requests with networkd,
@@ -62,18 +189,18 @@ in
     nohook resolv.conf, yp, hostname, ntp
     option rapid_commit
 
-    interface ${if_wan}
+    interface ${ifs.wan.name}
       ipv6rs
       dhcp6
 
       # this doesn't play well with networkd
       # ia_na
-      # ia_pd 1 ${if_lan}/0
+      # ia_pd 1 ${ifs.lan.name}/0
-      # ia_pd 2 ${if_lan10}/0
+      # ia_pd 2 ${ifs.lan10.name}/0
-      # ia_pd 3 ${if_lan20}/0
+      # ia_pd 3 ${ifs.lan20.name}/0
 
       # request the leases just for routing (so that the att box knows we're here)
-      # actual ip assignments are static, based on $pd_from_wan
+      # actual ip assignments are static, based on $pdFromWan
       ia_pd 1 -
       ia_pd 2 -
       # ia_pd 3 -
@@ -99,116 +226,53 @@ in
     links = {
       "10-wan" = {
         matchConfig.PermanentMACAddress = "bc:24:11:4f:c9:c4";
-        linkConfig.Name = if_wan;
+        linkConfig.Name = ifs.wan.name;
       };
       "10-lan" = {
         matchConfig.PermanentMACAddress = "bc:24:11:83:d8:de";
-        linkConfig.Name = if_lan;
+        linkConfig.Name = ifs.lan.name;
       };
     };
 
     netdevs = {
-      "10-vlan10" = {
+      "10-vlan10" = mkVlanDev { id = 10; name = ifs.lan10.name; };
-        netdevConfig = {
+      "10-vlan20" = mkVlanDev { id = 20; name = ifs.lan20.name; };
-          Kind = "vlan";
+      "10-vlan30" = mkVlanDev { id = 30; name = ifs.lan30.name; };
-          Name = if_lan10;
+      "10-vlan40" = mkVlanDev { id = 40; name = ifs.lan40.name; };
-        };
+      "10-vlan50" = mkVlanDev { id = 50; name = ifs.lan50.name; };
-        vlanConfig.Id = 10;
-      };
-      "10-vlan20" = {
-        netdevConfig = {
-          Kind = "vlan";
-          Name = if_lan20;
-        };
-        vlanConfig.Id = 20;
-      };
     };
 
     networks = {
       "10-wan" = {
-        matchConfig.Name = if_wan;
+        matchConfig.Name = ifs.wan.name;
         networkConfig = {
           # start a DHCP Client for IPv4 Addressing/Routing
           # DHCP = "ipv4";
           # accept Router Advertisements for Stateless IPv6 Autoconfiguraton (SLAAC)
           # let dhcpcd handle this
-          Address = [ wan_ip4 ];
+          Address = [ ifs.wan.addr4Sized ];
           IPv6AcceptRA = false;
         };
-        routes = [ { Gateway = wan_gw4; } ];
+        routes = [ { Gateway = ifs.wan.gw4; } ];
         # make routing on this interface a dependency for network-online.target
         linkConfig.RequiredForOnline = "routable";
       };
+      # "20-lan" = (mkLanConfig ifs.lan) // {
       "20-lan" = {
-        matchConfig.Name = "lan";
+        matchConfig.Name = ifs.lan.name;
         vlan = [
-          if_lan10
+          ifs.lan10.name
-          if_lan20
+          ifs.lan20.name
-        ];
+          ifs.lan30.name
-        networkConfig = {
+          ifs.lan40.name
-          IPv4Forwarding = true;
+          ifs.lan50.name
-          IPv6SendRA = true;
-          Address = [ "${lan_p4}.1/24" ];
-        };
-        ipv6Prefixes = [
-          {
-            # AddressAutoconfiguration = false;
-            Prefix = "${lan_p6}::/64";
-            Assign = true;
-            # Token = [ "static:::1" "eui64" ];
-            Token = [ "static:::1" ];
-          }
-          {
-            Prefix = "${lan_ula_p}::/64";
-            Assign = true;
-            Token = [ "static:::1" ];
-          }
-        ];
-        ipv6SendRAConfig = {
-          Managed = true;
-          OtherInformation = true;
-          EmitDNS = true;
-          DNS = [ lan_ula_addr ];
-        };
-      };
-      "30-vlan10"  = {
-        matchConfig.Name = if_lan10;
-        networkConfig = {
-          IPv6SendRA = true;
-          Address = [ "${lan10_p4}.1/24" ];
-        };
-        ipv6Prefixes = [
-          {
-            Prefix = "${lan10_p6}::/64";
-            Assign = true;
-            Token = [ "static:::1" ];
-          }
-          {
-            Prefix = "${lan10_ula_p}::/64";
-            Assign = true;
-            Token = [ "static:::1" ];
-          }
-        ];
-      };
-      "30-vlan20"  = {
-        matchConfig.Name = if_lan20;
-        networkConfig = {
-          IPv6SendRA = true;
-          Address = [ "${lan20_p4}.1/24" ];
-        };
-        ipv6Prefixes = [
-          {
-            Prefix = "${lan20_p6}::/64";
-            Assign = true;
-            Token = [ "static:::1" ];
-          }
-          {
-            Prefix = "${lan20_ula_p}::/64";
-            Assign = true;
-            Token = [ "static:::1" ];
-          }
         ];
       };
+      "30-vlan10" = mkTempLanConfig ifs.lan10;
+      "30-vlan20" = mkTempLanConfig ifs.lan20;
+      "30-vlan30" = mkTempLanConfig ifs.lan30;
+      "30-vlan40" = mkTempLanConfig ifs.lan40;
+      "30-vlan50" = mkLanConfig ifs.lan50;
     };
   };
 
@@ -217,17 +281,35 @@ in
   networking.nftables.tables.firewall = {
     family = "inet";
     content = ''
-      define WAN_IF = "${if_wan}"
+      define LAN_IPV4_HOST = ${ifs.lan.p4}.100
-      define LAN_IF = "${if_lan}"
+      define LAN_IPV6_HOST = ${ifs.lan.p6}::1:1000
-      define LAN_IPV4_SUBNET = ${lan_p4}.0/24
+      define ZONE_WAN_IFS = { ${ifs.wan.name} }
-      define LAN_IPV6_SUBNET = ${lan_p6}::/64
+      define ZONE_LAN_IFS = {
-      define LAN_IPV6_ULA = ${lan_ula_p}::/64
+          ${ifs.lan.name},
-      define LAN_IPV4_HOST = ${lan_p4}.100
+          ${ifs.lan10.name},
-      define LAN_IPV6_HOST = ${lan_p6}::1:1000
+          ${ifs.lan20.name},
+          ${ifs.lan30.name},
+          ${ifs.lan40.name},
+          ${ifs.lan50.name},
+      }
+      define RFC1918 = { 10.0.0.0/8, 172.12.0.0/12, 192.168.0.0/16 }
 
-      define ALLOWED_TCP_PORTS = { ssh, https, 19999 }
+      define ALLOWED_TCP_PORTS = { ssh, https }
       define ALLOWED_UDP_PORTS = { domain }
 
+      map port_forward_v4 {
+          type inet_proto . inet_service : ipv4_addr . inet_service
+          elements = {
+              tcp . 8006 : ${ifs.lan50.p4}.10 . 8006
+          }
+      }
+      set port_forward_v6 {
+          type inet_proto . ipv6_addr . inet_service
+          elements = {
+              tcp . $LAN_IPV6_HOST . https
+          }
+      }
+
       chain input {
           type filter hook input priority filter; policy drop;
 
@@ -235,28 +317,19 @@ in
           ct state established,related accept
 
           # Allow all traffic from loopback interface
-          iifname lo accept
+          iif lo accept
 
           # Allow ICMPv6 on link local addrs
           ip6 nexthdr icmpv6 ip6 saddr fe80::/10 accept
           ip6 nexthdr icmpv6 ip6 daddr fe80::/10 accept # TODO: not sure if necessary
 
-          # Allow all ICMPv6 from LAN
-          iifname $LAN_IF ip6 saddr { $LAN_IPV6_SUBNET, $LAN_IPV6_ULA } ip6 nexthdr icmpv6 accept
           # Allow DHCPv6 client traffic
           ip6 daddr { fe80::/10, ff02::/16 } udp dport dhcpv6-server accept
 
-          # Allow all ICMP from LAN
+          # WAN zone input rules
-          iifname $LAN_IF ip saddr $LAN_IPV4_SUBNET ip protocol icmp accept
+          iifname $ZONE_WAN_IFS jump zone_wan_input
-
+          # LAN zone input rules
-          # Allow specific services from LAN
+          iifname $ZONE_LAN_IFS jump zone_lan_input
-          iifname $LAN_IF ip saddr $LAN_IPV4_SUBNET tcp dport $ALLOWED_TCP_PORTS accept
-          iifname $LAN_IF ip6 saddr { $LAN_IPV6_SUBNET, $LAN_IPV6_ULA } tcp dport $ALLOWED_TCP_PORTS accept
-          iifname $LAN_IF ip saddr $LAN_IPV4_SUBNET udp dport $ALLOWED_UDP_PORTS accept
-          iifname $LAN_IF ip6 saddr { $LAN_IPV6_SUBNET, $LAN_IPV6_ULA } udp dport $ALLOWED_UDP_PORTS accept
-
-          # Allow SSH from WAN (if needed)
-          iifname $WAN_IF tcp dport ssh accept
       }
 
       chain forward {
@@ -265,20 +338,53 @@ in
           # Allow established and related connections
           ct state established,related accept
 
+          # WAN zone forward rules
+          iifname $ZONE_WAN_IFS jump zone_wan_forward
+          # LAN zone forward rules
+          iifname $ZONE_LAN_IFS jump zone_lan_forward
+      }
+
+      chain zone_wan_input {
+          # Allow SSH from WAN (if needed)
+          tcp dport ssh accept
+      }
+
+      chain zone_wan_forward {
           # Port forwarding
-          iifname $WAN_IF tcp dport https ip daddr $LAN_IPV4_HOST accept
+          ct status dnat accept
 
           # Allowed IPv6 ports
-          iifname $WAN_IF tcp dport https ip6 daddr $LAN_IPV6_HOST accept
+          meta l4proto . ip6 daddr . th dport @port_forward_v6 accept
+      }
 
-          # Allow traffic from LAN to WAN
+      chain zone_lan_input {
-          iifname $LAN_IF ip saddr $LAN_IPV4_SUBNET oifname $WAN_IF accept
+          # Allow all ICMPv6 from LAN
-          iifname $LAN_IF ip6 saddr $LAN_IPV6_SUBNET oifname $WAN_IF accept
+          ip6 nexthdr icmpv6 accept
+          # Allow all ICMP from LAN
+          ip protocol icmp accept
+
+          # Allow specific services from LAN
+          tcp dport $ALLOWED_TCP_PORTS accept
+          udp dport $ALLOWED_UDP_PORTS accept
+      }
+
+      chain zone_lan_forward {
+          # Allow port forwarded targets
+          # ct status dnat accept
+
+          # Allow all traffic from LAN to WAN, except ULAs
+          oifname $ZONE_WAN_IFS ip6 saddr fd00::/8 drop
+          oifname $ZONE_WAN_IFS accept;
+
+          # Allow traffic between LANs
+          oifname $ZONE_LAN_IFS accept
       }
 
       chain output {
           # Accept anything out of self by default
           type filter hook output priority filter; policy accept;
+          # NAT reflection
+          # oif lo ip daddr != 127.0.0.0/8 dnat ip to meta l4proto . th dport map @port_forward_v4
       }
 
       chain prerouting {
@@ -286,7 +392,9 @@ in
           type nat hook prerouting priority dstnat; policy accept;
 
           # Port forwarding
-          iifname $WAN_IF tcp dport https dnat ip to $LAN_IPV4_HOST
+          # iifname $ZONE_WAN_IFS tcp dport https dnat ip to $LAN_IPV4_HOST
+          # tcp dport $PROX_PORT fib daddr type local dnat ip to $PROX_HOST
+          fib daddr type local dnat ip to meta l4proto . th dport map @port_forward_v4
       }
 
       chain postrouting {
@@ -294,12 +402,10 @@ in
           type nat hook postrouting priority srcnat; policy accept;
 
           # Masquerade LAN addrs
-          # theoretically shouldn't need to check the input interface here,
+          oifname $ZONE_WAN_IFS ip saddr $RFC1918 masquerade
-          # as it would be filtered by the forwarding rules
-          oifname $WAN_IF ip saddr $LAN_IPV4_SUBNET masquerade
 
-          # Optional IPv6 masquerading (big L if enabled)
+          # Optional IPv6 masquerading (big L if enabled, don't forget to allow forwarding)
-          # oifname $WAN_IF ip6 saddr $LAN_IPV6_ULA masquerade
+          # oifname $ZONE_WAN_IFS ip6 saddr fd00::/8 masquerade
       }
     '';
   };
@@ -307,79 +413,60 @@ in
   services.kea.dhcp4.enable = true;
   services.kea.dhcp4.settings = {
     interfaces-config.interfaces = [
-      if_lan
+      ifs.lan.name
+      # ifs.lan10.name
+      # ifs.lan20.name
+      ifs.lan50.name
     ];
     dhcp-ddns.enable-updates = true;
-    ddns-qualifying-suffix = "default.${ldomain}";
+    ddns-qualifying-suffix = "4.default.${ldomain}";
     subnet4 = [
-      {
+      ((mkDhcp4Subnet 1 ifs.lan) // {
-        id = 1;
-        subnet = "${lan_p4}.0/24";
-        ddns-qualifying-suffix = "lan.${ldomain}";
-        pools = [ { pool = "${lan_p4}.100 - ${lan_p4}.199"; } ];
-        option-data = [
-          {
-            name = "routers";
-            data = "${lan_p4}.1";
-          }
-          {
-            name = "domain-name-servers";
-            data = "${lan_p4}.1";
-          }
-        ];
         reservations = [
           {
             hw-address = "bc:24:11:b7:27:4d";
             hostname = "archy";
-            ip-address = "${lan_p4}.69";
+            ip-address = "${ifs.lan.p4}.69";
           }
         ];
-      }
+      })
+      (mkDhcp4Subnet 50 ifs.lan50)
     ];
   };
 
   services.kea.dhcp6.enable = true;
   services.kea.dhcp6.settings = {
     interfaces-config.interfaces = [
-      if_lan
+      ifs.lan.name
+      # ifs.lan10.name
+      # ifs.lan20.name
+      ifs.lan50.name
     ];
     # TODO: https://kea.readthedocs.io/en/latest/arm/ddns.html#dual-stack-environments
     dhcp-ddns.enable-updates = true;
-    ddns-qualifying-suffix = "default6.${ldomain}";
+    ddns-qualifying-suffix = "6.default.${ldomain}";
     subnet6 = [
-      {
+      ((mkDhcp6Subnet 1 ifs.lan) // {
-        id = 1;
-        interface = if_lan;
-        subnet = "${lan_p6}::/64";
-        ddns-qualifying-suffix = "lan6.${ldomain}";
-        rapid-commit = true;
-        pools = [ { pool = "${lan_p6}::1:1000/116"; } ];
         reservations = [
           {
             duid = "00:04:59:c3:ce:9a:08:cf:fb:b7:fe:74:9c:e3:b7:44:bf:01";
             hostname = "archy";
-            ip-addresses = [ "${lan_p6}::69" ];
+            ip-addresses = [ "${ifs.lan.p6}::69" ];
           }
         ];
-      }
+      })
+      (mkDhcp6Subnet 50 ifs.lan50)
     ];
   };
 
   services.kea.dhcp-ddns.enable = true;
   services.kea.dhcp-ddns.settings = {
-    forward-ddns = {
+    forward-ddns.ddns-domains = [
-      ddns-domains = [
       {
         name = "${ldomain}.";
-          dns-servers = [
+        dns-servers = [ { ip-address = "::1"; port = 1053; } ];
-            {
-              ip-address = "::1";
-              port = 1053;
       }
     ];
-        }
-      ];
-    };
   };
 
   services.resolved.enable = false;
@@ -399,7 +486,7 @@ in
     # https://adguard-dns.io/kb/general/dns-filtering-syntax/
     user_rules = [
       # DNS rewrites
-      "|grouter.${domain}^$dnsrewrite=${lan_ula_addr}"
+      "|grouter.${domain}^$dnsrewrite=${ifs.lan.ulaAddr}"
 
       # Allowed exceptions
       "@@||googleads.g.doubleclick.net"
@@ -408,10 +495,8 @@ in
 
   services.knot.enable = true;
   services.knot.settings = {
-    server = {
+    # server.listen = "0.0.0.0@1053";
-      # listen = "0.0.0.0@1053";
+    server.listen = "::1@1053";
-      listen = "::1@1053";
-    };
     # TODO: templates
     zone = [
       {
@@ -504,7 +589,8 @@ in
 
   # Enable the KDE Plasma Desktop Environment.
   # Useful for debugging with wireshark.
-  services.displayManager.sddm.enable = false;
+  # services.displayManager.sddm.enable = true;
+  hardware.graphics.enable = true;
   services.displayManager.sddm.wayland.enable = true;
   services.desktopManager.plasma6.enable = true;
   # No need for audio in VM