WIP: router: refactor config into separate files

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742957044,
+        "lastModified": 1740432748,
-        "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=",
+        "narHash": "sha256-BCeFtoJ/+LrZc03viRJWHfzAqqG8gPu/ikZeurv05xs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f",
+        "rev": "c12dcc9b61429b2ad437a7d4974399ad8f910319",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742568034,
+        "lastModified": 1737057290,
-        "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
+        "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
+        "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742669843,
+        "lastModified": 1740367490,
-        "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
+        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1e5b653dff12029333a6546c11e108ede13052eb",
+        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
         "type": "github"
       },
       "original": {
@@ -82,11 +82,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742765550,
+        "lastModified": 1739557722,
-        "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=",
+        "narHash": "sha256-XikzLpPUDYiNyJ4w2SfRShdbSkIgE3btYdxCGInmtc4=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16",
+        "rev": "1f3e1f38dedbbb8aad77e184fb54ec518e2d9522",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -54,8 +54,8 @@ in
     };
     # alias for nix shell with flake packages
     functions.add.body = ''
-      set -x packages 'nixpkgs#'$argv
+      set -x packages 'nixpkgs#'(string join ' nixpkgs#' $argv)
-      nix shell $packages
+      nix shell $packages --command fish
     '';
     interactiveShellInit = ''
       fastfetch

hosts/Yura-PC/default.nix

@@ -209,35 +209,13 @@
   # fonts.fontconfig.allowBitmaps = false;
   
   environment.systemPackages = with pkgs; [
+    darkman
     dust
+    efibootmgr
     eza
     fastfetch
     fd
-    helix
-    micro
-    ripgrep
-    starship
-    tealdeer
-  ] ++ [
-    efibootmgr
     ffmpeg
-    file
-    fq
-    gnumake
-    ijq
-    jq
-    ldns
-    mediainfo
-    rbw
-    restic
-    resticprofile
-    rclone
-    ripgrep-all
-    rustscan
-    whois
-    yt-dlp
-  ] ++ [
-    darkman
     host-spawn # for flatpaks
     kdePackages.filelight
     kdePackages.flatpak-kcm
@@ -245,14 +223,8 @@
     kdePackages.yakuake
     gcr
     gnome-keyring # config for this and some others
-    mpv
+    gnumake
-    nextcloud-client
+    helix
-    lxqt.pavucontrol-qt
-    pinentry
-    tela-circle-icon-theme
-    virt-viewer
-    waypipe
-  ] ++ [
     # jetbrains.rust-rover
     # jetbrains.goland
     jetbrains.clion
@@ -260,7 +232,22 @@
     jetbrains.pycharm-professional
     jetbrains.webstorm
     android-studio
+    mediainfo
+    micro
+    mpv
+    nextcloud-client
+    lxqt.pavucontrol-qt
+    pinentry
+    rbw
+    ripgrep
     rustup
+    starship
+    tealdeer
+    tela-circle-icon-theme
+    virt-viewer
+    waypipe
+    whois
+    yt-dlp
   ];
 
   # Some programs need SUID wrappers, can be configured further or are

hosts/router/dns.nix

@@ -46,15 +46,7 @@ in
     dns = {
       bootstrap_dns = [ "1.1.1.1" "9.9.9.9" ];
       upstream_dns = [
-        # Default upstreams
+        "quic://p0.freedns.controld.com"  # Default upstream
-        "quic://p0.freedns.controld.com"
-        "tls://one.one.one.one"
-        "tls://dns.quad9.net"
-
-        # Adguard uses upstream and not rewrite rules to resolve cname rewrites,
-        # and obviously my sysdomain entries don't exist in cloudflare.
-        "[/${sysdomain}/][::1]"           # Sys domains to self (for cname rewrites)
-
         "[/${ldomain}/][::1]:1053"        # Local domains to Knot (ddns)
         "[/home/][${ifs.lan.ulaPrefix}::250]"  # .home domains to opnsense (temporary)
       ];
@@ -64,30 +56,26 @@ in
       # DNS rewrites
       "|grouter.${domain}^$dnsrewrite=${ifs.lan.ulaAddr}"
       "|pve-1.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.5"
-      "|pve-1.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::5:1"
       "|pve-3.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.7"
+      "|pve-1.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::5:1"
       "|pve-3.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::7:1"
-      "|truenas.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.10"
-      "|truenas.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::20d0:43ff:fec6:3192"
-      "|debbi.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.11"
-      "|debbi.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::11:1"
-      "|etappi.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.12"
-      "|etappi.${sysdomain}^$dnsrewrite=${ifs.lan.ulaPrefix}::12:1"
 
-      # Lab DNS rewrites
+      "||lab.${domain}^$dnsrewrite=${ifs.lan.p6}::12:1"
-      "||lab.${domain}^$dnsrewrite=etappi.${sysdomain}"
+      "||lab.${domain}^$dnsrewrite=${ifs.lan.p4}.12"
 
       # Allowed exceptions
       "@@||googleads.g.doubleclick.net"
     ]
       # Alpina DNS rewrites
-      ++ map (host: "${host}${domain}^$dnsrewrite=debbi.${sysdomain}") alpinaDomains;
+      ++ map (host: "${host}${domain}^$dnsrewrite=${ifs.lan.p6}:1cd5:56ff:feec:c74a") alpinaDomains
+      ++ map (host: "${host}${domain}^$dnsrewrite=${ifs.lan.p4}.11") alpinaDomains;
   };
 
   services.knot.enable = true;
   services.knot.settings = {
     # server.listen = "0.0.0.0@1053";
     server.listen = "::1@1053";
+    # TODO: templates
     zone = [
       {
         domain = ldomain;

hosts/router/firewall.nix

@@ -1,6 +1,9 @@
 { config, lib, pkgs, ... }:
 let
   vars = import ./vars.nix;
+  domain = vars.domain;
+  ldomain = vars.ldomain;
+  sysdomain = vars.sysdomain;
   links = vars.links;
   ifs = vars.ifs;
   pdFromWan = vars.pdFromWan;
@@ -20,23 +23,8 @@ in
           ${ifs.lan40.name},
           ${ifs.lan50.name},
       }
-      define OPNSENSE_NET6 = ${pdFromWan}d::/64
+      define OPNSENSE_P6 = ${pdFromWan}d::/64
-      define ZONE_LAN_EXTRA_NET6 = {
-          ${ifs.lan20.net6},  # needed since packets can come in from wan on these addrs
-          $OPNSENSE_NET6,
-      }
       define RFC1918 = { 10.0.0.0/8, 172.12.0.0/12, 192.168.0.0/16 }
-      define CLOUDFLARE_NET6 = {
-          # https://www.cloudflare.com/ips-v6
-          # TODO: figure out a better way to get addrs dynamically from url
-          2400:cb00::/32,
-          2606:4700::/32,
-          2803:f800::/32,
-          2405:b500::/32,
-          2405:8100::/32,
-          2a06:98c0::/29,
-          2c0f:f248::/32,
-      }
 
       define ALLOWED_TCP_PORTS = { ssh, https }
       define ALLOWED_UDP_PORTS = { bootps, dhcpv6-server, domain }
@@ -49,12 +37,9 @@ in
       }
       set port_forward_v6 {
           type inet_proto . ipv6_addr . inet_service
-          # elements = {}
-      }
-      set cloudflare_forward_v6 {
-          type ipv6_addr
           elements = {
-              ${ifs.lan.p6}::11:1,
+              tcp . ${ifs.lan.p6}::11:1 . https,
+              tcp . ${ifs.lan.p6}:1cd5:56ff:feec:c74a . https,
           }
       }
 
@@ -64,9 +49,7 @@ in
           # Drop router adverts from self
           # peculiarity due to wan and lan20 being bridged
           # TODO: figure out a less jank way to do this
-          iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} icmpv6 type nd-router-advert log prefix "self radvt: " drop
+          iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} icmpv6 type nd-router-advert log drop
-          # iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} ip6 nexthdr icmpv6 log prefix "self icmpv6: " drop
-          # iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} log prefix "self llv6: " drop
           # iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} log drop
           # iifname $ZONE_LAN_IFS ip6 saddr ${links.wanLL} log drop
 
@@ -84,19 +67,17 @@ in
           # Allow all traffic from loopback interface
           iif lo accept
 
-          # Allow DHCPv6 traffic
+          # Allow DHCPv6 client traffic
-          # I thought dhcpv6-client traffic would be accepted by established/related,
+          ip6 daddr { fe80::/10, ff02::/16 } th dport dhcpv6-server accept
-          # but apparently not.
-          ip6 daddr { fe80::/10, ff02::/16 } th dport { dhcpv6-client, dhcpv6-server } accept
 
           # WAN zone input rules
           iifname $ZONE_WAN_IFS jump zone_wan_input
           # LAN zone input rules
           iifname $ZONE_LAN_IFS accept
           iifname $ZONE_LAN_IFS jump zone_lan_input
-          ip6 saddr $ZONE_LAN_EXTRA_NET6 jump zone_lan_input
+          ip6 saddr $OPNSENSE_P6 jump zone_lan_input
 
-          # log
+          log
       }
 
       chain forward {
@@ -109,7 +90,7 @@ in
           iifname $ZONE_WAN_IFS jump zone_wan_forward
           # LAN zone forward rules
           iifname $ZONE_LAN_IFS jump zone_lan_forward
-          ip6 saddr $ZONE_LAN_EXTRA_NET6 jump zone_lan_forward
+          ip6 saddr $OPNSENSE_P6 jump zone_lan_forward
       }
 
       chain zone_wan_input {
@@ -123,9 +104,6 @@ in
 
           # Allowed IPv6 ports
           meta l4proto . ip6 daddr . th dport @port_forward_v6 accept
-
-          # Allowed IPv6 from cloudflare
-          ip6 saddr $CLOUDFLARE_NET6 ip6 daddr @cloudflare_forward_v6 accept
       }
 
       chain zone_lan_input {

hosts/router/ifconfig.nix

@@ -18,7 +18,7 @@ let
     matchConfig.Name = ifObj.name;
     networkConfig = {
       IPv4Forwarding = true;
-      IPv6SendRA = true;
+      IPv6SendRA = (ifObj.name != ifs.lan10.name);  # TODO: temporary test, remove
       Address = [ ifObj.addr4Sized ifObj.addr6Sized ifObj.ulaAddrSized ];
     };
     ipv6Prefixes = [
@@ -44,49 +44,70 @@ let
       DNS = [ ifObj.ulaAddr ];
     };
   };
+
 in
 {
   # It is impossible to do multiple prefix requests with networkd,
   # so I use dhcpcd for this
   # https://github.com/systemd/systemd/issues/22571
+  networking.dhcpcd.enable = true;
   # https://github.com/systemd/systemd/issues/22571#issuecomment-2094905496
   # https://gist.github.com/csamsel/0f8cca3b2e64d7e4cc47819ec5ba9396
-  networking.dhcpcd.enable = true;
-  networking.dhcpcd.allowInterfaces = [ ifs.wan.name ];
   networking.dhcpcd.extraConfig = ''
-    debug
+    duid
+    ipv6only
+    nodhcp6
+    noipv6rs
     nohook resolv.conf, yp, hostname, ntp
+    option rapid_commit
 
     interface ${ifs.wan.name}
-      ipv6only
-      duid
       ipv6rs
       dhcp6
-      # option rapid_commit
+      duid
+      ipv6only
+      nohook resolv.conf, yp, hostname, ntp
+      nogateway
+      option rapid_commit
 
-      # DHCPv6 addr
+      # this doesn't play well with networkd
-      ia_na
+      # ia_na
-
+      # ia_pd 1 ${ifs.lan.name}/0
-      # DHCPv6 Prefix Delegation
+      # ia_pd 2 ${ifs.lan10.name}/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 $pdFromWan
       ia_pd 1/${ifs.lan.net6} -
-      ia_pd 10/${ifs.lan10.net6} -
+      # ia_pd 10/${ifs.lan10.net6} -
       # ia_pd 20/${pdFromWan}d::/64 -  # for opnsense (legacy services)
       ia_pd 30/${ifs.lan30.net6} -
       ia_pd 40/${ifs.lan40.net6} -
       ia_pd 50/${ifs.lan50.net6} -
       # ia_pd 7 -
       # ia_pd 8 -
-
-      # the leases can be assigned to the interfaces,
-      # but this doesn't play well with networkd
-      # ia_pd 1 ${ifs.lan.name}/0
-      # ia_pd 2 ${ifs.lan10.name}/0
-      # ia_pd 3 ${ifs.lan20.name}/0
   '';
 
+  systemd.timers."restart-networkd" = {
+    wantedBy = [ "timers.target" ];
+      timerConfig = {
+        OnBootSec = "1m";
+        OnUnitActiveSec = "1m";
+        Unit = "restart-networkd.service";
+      };
+  };
+
+  systemd.services."restart-networkd" = {
+    script = ''
+      set -eu
+      ${pkgs.systemd}/bin/systemctl restart systemd-networkd
+    '';
+    serviceConfig = {
+      Type = "oneshot";
+      User = "root";
+    };
+  };
+
   networking.useNetworkd = true;
   systemd.network.enable = true;
   systemd.network = {
@@ -111,7 +132,7 @@ in
     };
 
     netdevs = {
-      "10-vlan10" = mkVlanDev { id = 10; name = ifs.lan10.name; };
+      # "10-vlan10" = mkVlanDev { id = 10; name = ifs.lan10.name; };
       "10-vlan20" = mkVlanDev { id = 20; name = ifs.lan20.name; };
       "10-vlan30" = mkVlanDev { id = 30; name = ifs.lan30.name; };
       "10-vlan40" = mkVlanDev { id = 40; name = ifs.lan40.name; };
@@ -121,8 +142,6 @@ in
     networks = {
       "10-wan" = {
         matchConfig.Name = ifs.wan.name;
-        # make routing on this interface a dependency for network-online.target
-        linkConfig.RequiredForOnline = "routable";
         networkConfig = {
           # start a DHCP Client for IPv4 Addressing/Routing
           # DHCP = "ipv4";
@@ -130,51 +149,76 @@ in
           # let dhcpcd handle this
           Address = [ ifs.wan.addr4Sized ];
           IPv6AcceptRA = false;
-          KeepConfiguration = true;
         };
         routes = [
           { Gateway = ifs.wan.gw4; }
+          { Gateway = ifs.wan.gw6; }
         ];
+        # make routing on this interface a dependency for network-online.target
+        linkConfig.RequiredForOnline = "routable";
       };
       "20-lan" = (mkLanConfig ifs.lan) // {
         vlan = [
-          ifs.lan10.name
+          # ifs.lan10.name
           ifs.lan20.name
           ifs.lan30.name
           ifs.lan40.name
           ifs.lan50.name
         ];
       };
-      "30-vlan10" = mkLanConfig ifs.lan10;
+      # "30-vlan10" = mkLanConfig ifs.lan10;
-      "30-vlan20" = mkLanConfig ifs.lan20;
+      "30-vlan20" = mkLanConfig ifs.lan20 // {
+        routes = [
+          {
+            # OPNsense subnet route
+            Destination = "${pdFromWan}d::/64";
+            Gateway = "fe80::1efd:8ff:fe71:954e";
+          }
+        ];
+      };
       "30-vlan30" = mkLanConfig ifs.lan30;
       "30-vlan40" = mkLanConfig ifs.lan40;
       "30-vlan50" = mkLanConfig ifs.lan50;
     };
   };
 
-  # For some reason, the interfaces stop receiving route solicitations after a while.
+  networking.interfaces = {
-  # Regular router adverts still get sent out at intervals, but this breaks dhcp6 clients.
+#    ${ifs.lan10.name} = {
-  # Restarting networkd makes it work again, I have no clue why.
+#      ipv4.addresses = [ { address = ifs.lan10.addr4; prefixLength = ifs.lan10.p4Size; } ];
-  # This is jank af, but I've tried a bunch of other stuff with no success
+#      ipv6.addresses = [
-  # and I'm giving up (for now).
+#        {
-  systemd.timers."restart-networkd" = {
+#          address = ifs.lan10.addr6;
-    wantedBy = [ "timers.target" ];
+#          prefixLength = ifs.lan10.p6Size;
-      timerConfig = {
+#        }
-        OnBootSec = "1m";
+#        {
-        OnUnitActiveSec = "1m";
+#          address = ifs.lan10.ulaAddr;
-        Unit = "restart-networkd.service";
+#          prefixLength = ifs.lan10.ulaSize;
-      };
+#        }
+#      ];
+#    };
   };
+  networking.dhcpcd.allowInterfaces = [ ifs.wan.name ];
 
-  systemd.services."restart-networkd" = {
+  services.radvd.enable = false;
-    script = ''
+  services.radvd.config = ''
-      set -eu
+    interface ${ifs.lan10.name} {
-      ${pkgs.systemd}/bin/systemctl restart systemd-networkd
+      RDNSS ${ifs.lan.ulaAddr} {
-    '';
+      };
-    serviceConfig = {
+      AdvSendAdvert on;
-      Type = "oneshot";
+      # MinRtrAdvInterval 3;
-      User = "root";
+      # MaxRtrAdvInterval 10;
+      AdvManagedFlag on;
+      # AdvOtherConfigFlag on;
+      prefix ${ifs.lan10.net6} {
+        AdvOnLink on;
+        AdvAutonomous on;
+      };
+      prefix ${ifs.lan10.ulaNet} {
+        AdvOnLink on;
+        AdvAutonomous on;
+      };
+      route ${ulaPrefix}::/48 {
+      };
     };
-  };
+  '';
 }

hosts/router/kea.nix

@@ -131,7 +131,7 @@ in
   services.kea.dhcp4.settings = {
     interfaces-config.interfaces = [
       ifs.lan.name
-      ifs.lan10.name
+      # ifs.lan10.name
       ifs.lan20.name
       ifs.lan30.name
       ifs.lan40.name
@@ -141,7 +141,7 @@ in
     ddns-qualifying-suffix = "4.default.${ldomain}";
     subnet4 = [
       ((mkDhcp4Subnet 1 ifs.lan) // reservations.lan.v4)
-      (mkDhcp4Subnet 10 ifs.lan10)
+      # (mkDhcp4Subnet 10 ifs.lan10)
       ((mkDhcp4Subnet 20 ifs.lan20) // reservations.lan20.v4)
       (mkDhcp4Subnet 30 ifs.lan30)
       (mkDhcp4Subnet 40 ifs.lan40)
@@ -153,7 +153,7 @@ in
   services.kea.dhcp6.settings = {
     interfaces-config.interfaces = [
       ifs.lan.name
-      ifs.lan10.name
+      # ifs.lan10.name
       # ifs.lan20.name  # Managed by Att box
       ifs.lan30.name
       ifs.lan40.name
@@ -164,7 +164,7 @@ in
     ddns-qualifying-suffix = "6.default.${ldomain}";
     subnet6 = [
       ((mkDhcp6Subnet 1 ifs.lan) // reservations.lan.v6)
-      (mkDhcp6Subnet 10 ifs.lan10)
+      # (mkDhcp6Subnet 10 ifs.lan10)
       (mkDhcp6Subnet 30 ifs.lan30)
       (mkDhcp6Subnet 40 ifs.lan40)
       (mkDhcp6Subnet 50 ifs.lan50)

hosts/router/vars.nix

@@ -50,6 +50,7 @@ rec {
       addr4 = "192.168.1.61";
       addr4Sized = "${addr4}/24";
       gw4 = "192.168.1.254";
+      gw6 = "fe80::e21f:2bff:fe96:e952";
     };
     lan = mkIfConfig {
       name_ = "lan";