WIP: router: bring back lan10

WIP: router: remove temporary tests
WIP: router: refactor config into separate files
2025-03-13 19:07:17 -07:00 · 2025-03-13 19:07:17 -07:00 · 2025-03-13 19:07:17 -07:00 · 2025-03-13 19:07:17 -07:00 · 2025-03-13 19:07:16 -07:00 · 2025-03-13 19:07:16 -07:00
8 changed files with 48 additions and 136 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1745001336,
-        "narHash": "sha256-R4HuzrgYtOYBNmB3lfRxcieHEBO4uSfgHNz4MzWkZ5M=",
+        "lastModified": 1741791118,
+        "narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fc09cb7aaadb70d6c4898654ffc872f0d2415df9",
+        "rev": "18780912345970e5b546b1b085385789b6935a83",
        "type": "github"
      },
      "original": {
@@ -43,11 +43,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742568034,
-        "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
+        "lastModified": 1740947705,
+        "narHash": "sha256-Co2kAD2SZalOm+5zoxmzEVZNvZ17TyafuFsD46BwSdY=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
+        "rev": "507911df8c35939050ae324caccc7cf4ffb76565",
        "type": "github"
      },
      "original": {
@@ -58,11 +58,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1744932701,
-        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
+        "lastModified": 1741513245,
+        "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
+        "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
        "type": "github"
      },
      "original": {
@@ -82,11 +82,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742765550,
-        "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=",
+        "lastModified": 1740569341,
+        "narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16",
+        "rev": "5eeb0172fb74392053b66a8149e61b5e191b2845",
        "type": "github"
      },
      "original": {
--- a/home/default.nix
+++ b/home/default.nix
@@ -19,7 +19,6 @@ in
    SHELL = "fish";
  };

-  # TODO: remove (replace by bitwarden-desktop)
  services.gnome-keyring = {
    enable = true;
    components = [ "pkcs11" "ssh" ];
@@ -49,7 +48,7 @@ in
      ll = "exa -l --color=always --group-directories-first --icons";  # long format
      lt = "exa -aT --color=always --group-directories-first --icons"; # tree listing
      "l." = "exa -a | rg '^\.'";                                      # show only dotfiles
-
+      
      # Replace cat with bat
      cat = "bat";
    };
@@ -162,7 +161,6 @@ in
        shellExpand = true;
      };
      dolphinrc.General.ShowFullPath = true;
-      dolphinrc.DetailsMode.PreviewSize.persistent = true;
      kactivitymanagerdrc = {
        activities."809dc779-bf5b-49e6-8e3f-cbe283cb05b6" = "Default";
        activities."b34a506d-ac4f-4797-8c08-6ef45bc49341" = "Fun";
--- a/hosts/Yura-PC/default.nix
+++ b/hosts/Yura-PC/default.nix
@@ -32,7 +32,7 @@

  boot.loader.timeout = 3;
  boot.loader.systemd-boot.configurationLimit = 5;
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_13;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;

  # https://nixos.wiki/wiki/Accelerated_Video_Playback
  hardware.graphics = {
@@ -125,7 +125,6 @@

      # Nix
      nixd
-      nil

      # Gleam
      gleam
@@ -160,7 +159,7 @@

  # https://discourse.nixos.org/t/firefox-does-not-use-kde-window-decorations-and-cursor/32132/3
  # programs.dconf.enable = true;
-  # programs.firefox = {
+  # programs.firefox = {                  
    # enable = true;
    # preferences = {
      # "widget.use-xdg-desktop-portal.file-picker" = 1;
@@ -179,9 +178,9 @@

  programs.nix-ld.enable = true;
  programs.nix-ld.libraries = with pkgs; [
-    # Add any missing dynamic libraries for unpackaged
+    # Add any missing dynamic libraries for unpackaged 
    # programs here, NOT in environment.systemPackages
-
+    
    # For JetBrains stuff
    # https://github.com/NixOS/nixpkgs/issues/240444
  ];
@@ -208,7 +207,7 @@
   ];
  # fonts.fontDir.enable = true;
  # fonts.fontconfig.allowBitmaps = false;
-
+  
  environment.systemPackages = with pkgs; [
    dust
    eza
@@ -238,14 +237,12 @@
    whois
    yt-dlp
  ] ++ [
-    bitwarden-desktop
    darkman
    host-spawn # for flatpaks
    kdePackages.filelight
    kdePackages.flatpak-kcm
    kdePackages.kate
    kdePackages.yakuake
-    # TODO: remove (replace by bitwarden-desktop)
    gcr
    gnome-keyring # config for this and some others
    mpv
@@ -264,7 +261,6 @@
    jetbrains.webstorm
    android-studio
    rustup
-    zed-editor
  ];

  # Some programs need SUID wrappers, can be configured further or are
--- a/hosts/router/dns.nix
+++ b/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"
-        "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)
-
+        "quic://p0.freedns.controld.com"  # Default upstream
        "[/${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=etappi.${sysdomain}"
+      "||lab.${domain}^$dnsrewrite=${ifs.lan.p6}::12:1"
+      "||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;
--- a/hosts/router/firewall.nix
+++ b/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,25 +23,8 @@ in
          ${ifs.lan40.name},
          ${ifs.lan50.name},
      }
-      define OPNSENSE_NET6 = ${vars.extra.opnsense.net6}
-      define ZONE_LAN_EXTRA_NET6 = {
-          # TODO: reevaluate this statement
-          ${ifs.lan20.net6},  # needed since packets can come in from wan on these addrs
-          $OPNSENSE_NET6,
-      }
+      define OPNSENSE_P6 = ${pdFromWan}d::/64
      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
-          # perhaps building a nixos module/package that fetches the ips?
-          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 }
@@ -51,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,
          }
      }

@@ -66,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} 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} icmpv6 type nd-router-advert log drop
          # iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} log drop
          # iifname $ZONE_LAN_IFS ip6 saddr ${links.wanLL} log drop

@@ -86,19 +67,17 @@ in
          # Allow all traffic from loopback interface
          iif lo accept

-          # Allow DHCPv6 traffic
-          # I thought dhcpv6-client traffic would be accepted by established/related,
-          # but apparently not.
-          ip6 daddr { fe80::/10, ff02::/16 } th dport { dhcpv6-client, dhcpv6-server } accept
+          # Allow DHCPv6 client traffic
+          ip6 daddr { fe80::/10, ff02::/16 } th dport 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 {
@@ -111,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 {
@@ -125,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 th dport https accept
      }

      chain zone_lan_input {
--- a/hosts/router/ifconfig.nix
+++ b/hosts/router/ifconfig.nix
@@ -46,12 +46,6 @@ let
  };
 in
 {
-  # By default, Linux will respond to ARP requests that belong to other interfaces.
-  # Normally this isn't a problem, but it causes issues
-  # since my WAN and LAN20 are technically bridged.
-  # https://networkengineering.stackexchange.com/questions/83071/why-linux-answers-arp-requests-for-ips-that-belong-to-different-network-interfac
-  boot.kernel.sysctl."net.ipv4.conf.default.arp_filter" = 1;
-
  # It is impossible to do multiple prefix requests with networkd,
  # so I use dhcpcd for this
  # https://github.com/systemd/systemd/issues/22571
@@ -60,15 +54,20 @@ in
  networking.dhcpcd.enable = true;
  networking.dhcpcd.allowInterfaces = [ ifs.wan.name ];
  networking.dhcpcd.extraConfig = ''
-    debug
    nohook resolv.conf, yp, hostname, ntp

    interface ${ifs.wan.name}
-      ipv6only
+      # IPv4 (Static)
+      nodhcp
+      noipv4ll
+      static ip_address=${ifs.wan.addr4Sized}
+      static routers=${ifs.wan.gw4}
+
+      # IPv6
      duid
      ipv6rs
      dhcp6
-      # option rapid_commit
+      option rapid_commit

      # DHCPv6 addr
      ia_na
@@ -127,20 +126,10 @@ 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";
-          # accept Router Advertisements for Stateless IPv6 Autoconfiguraton (SLAAC)
-          # let dhcpcd handle this
-          Address = [ ifs.wan.addr4Sized ];
-          IPv6AcceptRA = false;
-          KeepConfiguration = true;
+        linkConfig = {
+          Unmanaged = true;
+          RequiredForOnline = "routable";
        };
-        routes = [
-          { Gateway = ifs.wan.gw4; }
-        ];
      };
      "20-lan" = (mkLanConfig ifs.lan) // {
        vlan = [
@@ -150,7 +139,6 @@ in
          ifs.lan40.name
          ifs.lan50.name
        ];
-        routes = vars.extra.opnsense.routes;
      };
      "30-vlan10" = mkLanConfig ifs.lan10;
      "30-vlan20" = mkLanConfig ifs.lan20;
--- a/hosts/router/services.nix
+++ b/hosts/router/services.nix
@@ -4,16 +4,6 @@ let
  domain = vars.domain;
 in
 {
-  services.miniupnpd = {
-    enable = true;
-    natpmp = true;
-    externalInterface = vars.ifs.wan.name;
-    internalIPs = [
-      vars.ifs.lan.name
-      vars.ifs.lan20.name
-    ];
-  };
-
  # https://wiki.nixos.org/wiki/Prometheus
  services.prometheus = {
    enable = true;
--- a/hosts/router/vars.nix
+++ b/hosts/router/vars.nix
@@ -95,28 +95,4 @@ rec {
      ulaPrefix_ = "${ulaPrefix}:0050";  # ::/64
    };
  };
-
-  extra = {
-    opnsense = rec {
-      addr4 = "${ifs.lan.p4}.250";
-      ulaAddr = "${ifs.lan.ulaPrefix}::250";
-      p6 = "${pdFromWan}d";
-      net6 = "${p6}::/64";
-      # VPN routes on opnsense
-      routes = [
-        {
-          Destination = "10.6.0.0/24";
-          Gateway = addr4;
-        }
-        {
-          Destination = "10.18.0.0/20";
-          Gateway = addr4;
-        }
-        {
-          Destination = net6;
-          Gateway = ulaAddr;
-        }
-      ];
-    };
-  };
 }
Author	SHA1	Message	Date
Yuri Tatishchev	523e1c3ae5	WIP: router: bring back lan10	2025-03-13 19:07:17 -07:00
Yuri Tatishchev	4708733bc8	WIP: router: remove temporary tests	2025-03-13 19:07:17 -07:00
Yuri Tatishchev	06e3b61da4	WIP: router: refactor config into separate files	2025-03-13 19:07:17 -07:00
Yuri Tatishchev	e09fcb2bb0	WIP: router: attempt timer to restart networkd every minute	2025-03-13 19:07:17 -07:00
Yuri Tatishchev	574b243f40	WIP: router: attempt static ipv6 gateway on wan	2025-03-13 19:07:16 -07:00
Yuri Tatishchev	ceb908cbcf	WIP: router: temporarily disable lan10	2025-03-13 19:07:16 -07:00
Yuri Tatishchev	1c69bdaa06	WIP: router: attempt networking.interfaces config instead of networkd for lan10	2025-03-13 19:07:16 -07:00
Yuri Tatishchev	d3cb77434c	WIP: router: attempt removing networkd, some bs testing	2025-03-13 19:07:16 -07:00
Yuri Tatishchev	d3adc8b6a0	WIP: router: attempt some ipv6 prefix fixes	2025-03-13 19:07:09 -07:00