WIP: router: attempt static ipv6 gateway on wan

home/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 let
   defaultFont = {
     family = "Noto Sans";
@@ -38,6 +38,90 @@ in
     };
   };
 
+  programs.fish = {
+    enable = true;
+    shellInit = "set fish_greeting";
+    shellAliases = {
+      # Replace ls with exa
+      ls = "exa -al --color=always --group-directories-first --icons"; # preferred listing
+      la = "exa -a --color=always --group-directories-first --icons";  # all files and dirs
+      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";
+    };
+    # alias for nix shell with flake packages
+    functions.add.body = ''
+      set -x packages 'nixpkgs#'(string join ' nixpkgs#' $argv)
+      nix shell $packages --command fish
+    '';
+    interactiveShellInit = ''
+      fastfetch
+    '';
+  };
+
+  programs.starship = {
+    enable = true;
+    enableFishIntegration = true;
+    settings = {
+      format = lib.concatStrings [
+        "$all"
+        "$time"
+        "$cmd_duration"
+        "$line_break"
+        "$jobs"
+        "$status"
+        "$character"
+      ];
+      username = {
+        format = " [╭─$user]($style)@";
+        style_user = "bold red";
+        style_root = "bold red";
+        show_always = true;
+      };
+      hostname = {
+        format = "[$hostname]($style) in ";
+        style = "bold dimmed red";
+        ssh_only = false;
+      };
+      directory = {
+        style = "purple";
+        truncation_length = 0;
+        truncate_to_repo = true;
+        truncation_symbol = "repo: ";
+      };
+      git_status = {
+        style = "white";
+        ahead = "⇡\${count}";
+        diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
+        behind = "⇣\${count}";
+        deleted = "x";
+      };
+      cmd_duration = {
+        min_time = 1000;
+        format = "took [$duration]($style) ";
+      };
+      time = {
+        format = " 🕙 $time($style) ";
+        time_format = "%T";
+        style = "bright-white";
+        disabled = false;
+      };
+      character = {
+        success_symbol = " [╰─λ](bold red)";
+        error_symbol = " [×](bold red)";
+      };
+      status = {
+        symbol = "🔴";
+        format = "[\\[$symbol$status_common_meaning$status_signal_name$status_maybe_int\\]]($style)";
+        map_symbol = true;
+        disabled = false;
+      };
+    };
+  };
+
   programs.plasma = {
     enable = true;
     overrideConfig = true;
@@ -50,7 +134,11 @@ in
       menu = defaultFont;
       windowTitle = defaultFont;
     };
-    input.keyboard.layouts = [ { layout = "minimak-4"; displayName = "us4"; } ];
+    input.keyboard.layouts = [
+      { layout = "us"; displayName = "us"; }
+      { layout = "minimak-4"; displayName = "us4"; }
+      { layout = "ru"; displayName = "ru"; }
+    ];
     kwin.virtualDesktops.number = 2;
     session.sessionRestore.restoreOpenApplicationsOnLogin = "startWithEmptySession";
     shortcuts = {
@@ -58,6 +146,7 @@ in
       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" ];
+      "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Space";
     };
     hotkeys.commands."launch-konsole" = {
       name = "Launch Konsole";
@@ -81,6 +170,10 @@ in
     };
   };
 
+  xdg.configFile = {
+    "fcitx5/conf/wayland.conf".text = "Allow Overriding System XKB Settings=False";
+  };
+
   # 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.

hosts/Yura-PC/default.nix

@@ -125,6 +125,10 @@
 
       # Nix
       nixd
+
+      # Gleam
+      gleam
+      beamMinimal26Packages.erlang
     ];
   };
 

hosts/router/default.nix

@@ -2,6 +2,13 @@
 let
   domain = "cazzzer.com";
   ldomain = "l.${domain}";
+  sysdomain = "sys.${domain}";
+  links = {
+    wanMAC = "bc:24:11:4f:c9:c4";
+    lanMAC = "bc:24:11:83:d8:de";
+    wanLL = "fe80::be24:11ff:fe4f:c9c4";
+    lanLL = "fe80::be24:11ff:fe83:d8de";
+  };
 
   mkIfConfig = {
     name_,
@@ -10,6 +17,8 @@ let
     p6_,  # /64
     ulaPrefix_,  # /64
     token? 1,
+    ip6Token_? "::${toString token}",
+    ulaToken_? "::${toString token}",
     }: rec {
       name = name_;
       domain = domain_;
@@ -21,13 +30,14 @@ let
       p6 = p6_;
       p6Size = 64;
       net6 = "${p6}::/${toString p6Size}";
-      ip6Token = "::${toString token}";
+      ip6Token = ip6Token_;
       addr6 = "${p6}${ip6Token}";
       addr6Sized = "${addr6}/${toString p6Size}";
       ulaPrefix = ulaPrefix_;
       ulaSize = 64;
       ulaNet = "${ulaPrefix}::/${toString ulaSize}";
-      ulaAddr = "${ulaPrefix}${ip6Token}";
+      ulaToken = ulaToken_;
+      ulaAddr = "${ulaPrefix}${ulaToken}";
       ulaAddrSized = "${ulaAddr}/${toString ulaSize}";
     };
 
@@ -40,40 +50,42 @@ let
       addr4 = "192.168.1.61";
       addr4Sized = "${addr4}/24";
       gw4 = "192.168.1.254";
+      gw6 = "fe80::e21f:2bff:fe96:e952";
     };
     lan = mkIfConfig {
       name_ = "lan";
       domain_ = "lan.${ldomain}";
       p4_ = "${p4}.1";                   # .0/24
-      p6_ = "${pdFromWan}9";             # ::/64
+      p6_ = "${pdFromWan}f";             # ::/64
       ulaPrefix_ = "${ulaPrefix}:0001";  # ::/64
     };
     lan10 = mkIfConfig {
       name_ = "${lan.name}.10";
       domain_ = "lab.${ldomain}";
       p4_ = "${p4}.10";                  # .0/24
-      p6_ = "${pdFromWan}a";             # ::/64
+      p6_ = "${pdFromWan}e";             # ::/64
       ulaPrefix_ = "${ulaPrefix}:0010";  # ::/64
     };
     lan20 = mkIfConfig {
       name_ = "${lan.name}.20";
       domain_ = "life.${ldomain}";
       p4_ = "${p4}.20";                  # .0/24
-      p6_ = "${pdFromWan}2";             # ::/64
+      p6_ = "${pdFromWan}0";             # ::/64 managed by Att box
       ulaPrefix_ = "${ulaPrefix}:0020";  # ::/64
+      ip6Token_ = "::1:1";  # override ipv6 for lan20, since the Att box uses ::1 here
     };
     lan30 = mkIfConfig {
       name_ = "${lan.name}.30";
       domain_ = "iot.${ldomain}";
       p4_ = "${p4}.30";                  # .0/24
-      p6_ = "${pdFromWan}3";             # ::/64
+      p6_ = "${pdFromWan}c";             # ::/64
       ulaPrefix_ = "${ulaPrefix}:0030";  # ::/64
     };
     lan40 = mkIfConfig {
       name_ = "${lan.name}.40";
       domain_ = "kube.${ldomain}";
       p4_ = "${p4}.40";                  # .0/24
-      p6_ = "${pdFromWan}4";             # ::/64
+      p6_ = "${pdFromWan}b";             # ::/64
       ulaPrefix_ = "${ulaPrefix}:0040";  # ::/64
     };
     lan50 = mkIfConfig {
@@ -85,6 +97,128 @@ let
     };
   };
 
+  # Reservations added to Kea
+  reservations.lan.v4.reservations = [
+    {
+      hw-address = "64:66:b3:78:9c:09";
+      hostname = "openwrt";
+      ip-address = "${ifs.lan.p4}.2";
+    }
+    {
+      hw-address = "40:86:cb:19:9d:70";
+      hostname = "dlink-switchy";
+      ip-address = "${ifs.lan.p4}.3";
+    }
+    {
+      hw-address = "6c:cd:d6:af:4f:6f";
+      hostname = "netgear-switchy";
+      ip-address = "${ifs.lan.p4}.4";
+    }
+    {
+      hw-address = "74:d4:35:1d:0e:80";
+      hostname = "pve-1";
+      ip-address = "${ifs.lan.p4}.5";
+    }
+    {
+      hw-address = "00:25:90:f3:d0:e0";
+      hostname = "pve-2";
+      ip-address = "${ifs.lan.p4}.6";
+    }
+    {
+      hw-address = "a8:a1:59:d0:57:87";
+      hostname = "pve-3";
+      ip-address = "${ifs.lan.p4}.7";
+    }
+    {
+      hw-address = "22:d0:43:c6:31:92";
+      hostname = "truenas";
+      ip-address = "${ifs.lan.p4}.10";
+    }
+    {
+      hw-address = "1e:d5:56:ec:c7:4a";
+      hostname = "debbi";
+      ip-address = "${ifs.lan.p4}.11";
+    }
+    {
+      hw-address = "ee:42:75:2e:f1:a6";
+      hostname = "etappi";
+      ip-address = "${ifs.lan.p4}.12";
+    }
+  ];
+
+  reservations.lan.v6.reservations = [
+    {
+      duid = "00:03:00:01:64:66:b3:78:9c:09";
+      hostname = "openwrt";
+      ip-addresses = [ "${ifs.lan.p6}::1:2" ];
+    }
+    {
+      duid = "00:01:00:01:2e:c0:63:23:22:d0:43:c6:31:92";
+      hostname = "truenas";
+      ip-addresses = [ "${ifs.lan.p6}::10:1" ];
+    }
+    {
+      duid = "00:02:00:00:ab:11:09:41:25:21:32:71:e3:77";
+      hostname = "debbi";
+      ip-addresses = [ "${ifs.lan.p6}::11:1" ];
+    }
+    {
+      duid = "00:02:00:00:ab:11:6b:56:93:72:0b:3c:84:11";
+      hostname = "etappi";
+      ip-addresses = [ "${ifs.lan.p6}::12:1" ];
+    }
+  ];
+
+  reservations.lan20.v4.reservations = [
+    {
+      # Router
+      hw-address = "1c:3b:f3:da:5f:cc";
+      hostname = "archer-ax3000";
+      ip-address = "${ifs.lan20.p4}.2";
+    }
+    {
+      # Printer
+      hw-address = "30:cd:a7:c5:40:71";
+      hostname = "SEC30CDA7C54071";
+      ip-address = "${ifs.lan20.p4}.9";
+    }
+    {
+      # 3D Printer
+      hw-address = "20:f8:5e:ff:ae:5f";
+      hostname = "GS_ffae5f";
+      ip-address = "${ifs.lan20.p4}.11";
+    }
+    {
+      hw-address = "70:85:c2:d8:87:3f";
+      hostname = "Yura-PC";
+      ip-address = "${ifs.lan20.p4}.40";
+    }
+  ];
+
+  alpinaDomains = [
+    "|"
+    "|nc."
+    "|sonarr."
+    "|radarr."
+    "|prowlarr."
+    "|qbit."
+    "|gitea."
+    "|traefik."
+    "|auth."
+    "||s3."
+    "|minio."
+    "|jellyfin."
+    "|whoami."
+    "|grafana."
+    "|influxdb."
+    "|uptime."
+    "|opnsense."
+    "|vpgen."
+    "|woodpecker."
+    "||pgrok."
+    "|sync."
+  ];
+
   mkVlanDev = { id, name }: {
     netdevConfig = {
       Kind = "vlan";
@@ -97,8 +231,8 @@ let
     matchConfig.Name = ifObj.name;
     networkConfig = {
       IPv4Forwarding = true;
-      IPv6SendRA = true;
-      Address = [ ifObj.addr4Sized ];
+      IPv6SendRA = (ifObj.name != ifs.lan10.name);  # TODO: temporary test, remove
+      Address = [ ifObj.addr4Sized ifObj.addr6Sized ifObj.ulaAddrSized ];
     };
     ipv6Prefixes = [
       {
@@ -108,29 +242,22 @@ let
         Token = [ "static:${ifObj.ip6Token}" ];
       }
       {
-        Prefix = ifObj.ulaNet;
-        Assign = true;
-        Token = [ "static:${ifObj.ip6Token}" ];
+          Prefix = ifObj.ulaNet;
+          Assign = true;
+          Token = [ "static:${ifObj.ulaToken}" ];
       }
     ];
+    ipv6RoutePrefixes = [ { Route = "${ulaPrefix}::/48"; } ];
     ipv6SendRAConfig = {
-      Managed = true;
-      OtherInformation = true;
+      # don't manage the att box subnet
+      # should work fine either way though
+      Managed = (ifObj.p6 != "${pdFromWan}0");
+      OtherInformation = (ifObj.p6 != "${pdFromWan}0");
       EmitDNS = true;
       DNS = [ ifObj.ulaAddr ];
     };
   };
 
-  mkTempLanConfig = ifObj: {
-    matchConfig.Name = ifObj.name;
-    networkConfig = {
-      IPv4Forwarding = true;
-      # IPv6SendRA = true;
-      Address = [ "${ifObj.p4}.249/24" ];
-      # IPv6AcceptRA = true;
-    };
-  };
-
   mkDhcp4Subnet = id: ifObj: {
     id = id;
     subnet = ifObj.net4;
@@ -172,6 +299,10 @@ in
   boot.loader.systemd-boot.configurationLimit = 5;
   boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
   boot.growPartition = true;
+  # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes
+  # For upstream quic dns
+  boot.kernel.sysctl."net.core.wmem_max" = 7500000;
+  boot.kernel.sysctl."net.core.rmem_max" = 7500000;
 
   networking.hostName = "grouter";
 
@@ -192,6 +323,10 @@ in
     interface ${ifs.wan.name}
       ipv6rs
       dhcp6
+      duid
+      ipv6only
+      nohook resolv.conf, yp, hostname, ntp
+      option rapid_commit
 
       # this doesn't play well with networkd
       # ia_na
@@ -201,12 +336,12 @@ in
 
       # 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 -
-      ia_pd 2 -
-      # ia_pd 3 -
-      # ia_pd 4 -
-      # ia_pd 5 -
-      # ia_pd 6 -
+      ia_pd 1/${ifs.lan.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 -
   '';
@@ -225,17 +360,17 @@ in
     # https://nixos.org/manual/nixos/stable/#sec-rename-ifs
     links = {
       "10-wan" = {
-        matchConfig.PermanentMACAddress = "bc:24:11:4f:c9:c4";
+        matchConfig.PermanentMACAddress = links.wanMAC;
         linkConfig.Name = ifs.wan.name;
       };
       "10-lan" = {
-        matchConfig.PermanentMACAddress = "bc:24:11:83:d8:de";
+        matchConfig.PermanentMACAddress = links.lanMAC;
         linkConfig.Name = ifs.lan.name;
       };
     };
 
     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; };
@@ -253,36 +388,83 @@ in
           Address = [ ifs.wan.addr4Sized ];
           IPv6AcceptRA = false;
         };
-        routes = [ { Gateway = ifs.wan.gw4; } ];
+        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) // {
-      "20-lan" = {
-        matchConfig.Name = ifs.lan.name;
+      "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" = mkTempLanConfig ifs.lan10;
-      "30-vlan20" = mkTempLanConfig ifs.lan20;
-      "30-vlan30" = mkTempLanConfig ifs.lan30;
-      "30-vlan40" = mkTempLanConfig ifs.lan40;
+      # "30-vlan10" = mkLanConfig ifs.lan10;
+      "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;
     };
   };
 
+  networking.interfaces = {
+#    ${ifs.lan10.name} = {
+#      ipv4.addresses = [ { address = ifs.lan10.addr4; prefixLength = ifs.lan10.p4Size; } ];
+#      ipv6.addresses = [
+#        {
+#          address = ifs.lan10.addr6;
+#          prefixLength = ifs.lan10.p6Size;
+#        }
+#        {
+#          address = ifs.lan10.ulaAddr;
+#          prefixLength = ifs.lan10.ulaSize;
+#        }
+#      ];
+#    };
+  };
+  networking.dhcpcd.allowInterfaces = [ ifs.wan.name ];
+
+  services.radvd.enable = false;
+  services.radvd.config = ''
+    interface ${ifs.lan10.name} {
+      RDNSS ${ifs.lan.ulaAddr} {
+      };
+      AdvSendAdvert on;
+      # MinRtrAdvInterval 3;
+      # 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 {
+      };
+    };
+  '';
+
   networking.firewall.enable = false;
   networking.nftables.enable = true;
   networking.nftables.tables.firewall = {
     family = "inet";
     content = ''
-      define LAN_IPV4_HOST = ${ifs.lan.p4}.100
-      define LAN_IPV6_HOST = ${ifs.lan.p6}::1:1000
       define ZONE_WAN_IFS = { ${ifs.wan.name} }
       define ZONE_LAN_IFS = {
           ${ifs.lan.name},
@@ -292,10 +474,11 @@ in
           ${ifs.lan40.name},
           ${ifs.lan50.name},
       }
+      define OPNSENSE_P6 = ${pdFromWan}d::/64
       define RFC1918 = { 10.0.0.0/8, 172.12.0.0/12, 192.168.0.0/16 }
 
       define ALLOWED_TCP_PORTS = { ssh, https }
-      define ALLOWED_UDP_PORTS = { domain }
+      define ALLOWED_UDP_PORTS = { bootps, dhcpv6-server, domain }
 
       map port_forward_v4 {
           type inet_proto . inet_service : ipv4_addr . inet_service
@@ -306,30 +489,46 @@ in
       set port_forward_v6 {
           type inet_proto . ipv6_addr . inet_service
           elements = {
-              tcp . $LAN_IPV6_HOST . https
+              tcp . ${ifs.lan.p6}::11:1 . https,
+              tcp . ${ifs.lan.p6}:1cd5:56ff:feec:c74a . https,
           }
       }
 
       chain input {
           type filter hook input priority filter; policy drop;
 
+          # 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 drop
+          # iifname $ZONE_WAN_IFS ip6 saddr ${links.lanLL} log drop
+          # iifname $ZONE_LAN_IFS ip6 saddr ${links.wanLL} log drop
+
           # Allow established and related connections
+          # All icmp stuff should (theoretically) be handled by ct related
+          # https://serverfault.com/a/632363
           ct state established,related accept
 
+          # However, that doesn't happen for router advertisements from what I can tell
+          # TODO: more testing
+          # Allow ICMPv6 on local addrs
+          ip6 nexthdr icmpv6 ip6 saddr { fe80::/10, ${pdFromWan}0::/60 } accept
+          ip6 nexthdr icmpv6 ip6 daddr fe80::/10 accept # TODO: not sure if necessary
+
           # Allow all traffic from loopback interface
           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 DHCPv6 client traffic
-          ip6 daddr { fe80::/10, ff02::/16 } udp dport dhcpv6-server accept
+          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 $OPNSENSE_P6 jump zone_lan_input
+
+          log
       }
 
       chain forward {
@@ -342,6 +541,7 @@ in
           iifname $ZONE_WAN_IFS jump zone_wan_forward
           # LAN zone forward rules
           iifname $ZONE_LAN_IFS jump zone_lan_forward
+          ip6 saddr $OPNSENSE_P6 jump zone_lan_forward
       }
 
       chain zone_wan_input {
@@ -360,6 +560,7 @@ in
       chain zone_lan_input {
           # Allow all ICMPv6 from LAN
           ip6 nexthdr icmpv6 accept
+
           # Allow all ICMP from LAN
           ip protocol icmp accept
 
@@ -373,7 +574,7 @@ in
           # 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 ip6 saddr fd00::/8 drop  # Not sure if needed
           oifname $ZONE_WAN_IFS accept;
 
           # Allow traffic between LANs
@@ -392,8 +593,6 @@ in
           type nat hook prerouting priority dstnat; policy accept;
 
           # Port forwarding
-          # 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
       }
 
@@ -415,21 +614,19 @@ in
     interfaces-config.interfaces = [
       ifs.lan.name
       # ifs.lan10.name
-      # ifs.lan20.name
+      ifs.lan20.name
+      ifs.lan30.name
+      ifs.lan40.name
       ifs.lan50.name
     ];
     dhcp-ddns.enable-updates = true;
     ddns-qualifying-suffix = "4.default.${ldomain}";
     subnet4 = [
-      ((mkDhcp4Subnet 1 ifs.lan) // {
-        reservations = [
-          {
-            hw-address = "bc:24:11:b7:27:4d";
-            hostname = "archy";
-            ip-address = "${ifs.lan.p4}.69";
-          }
-        ];
-      })
+      ((mkDhcp4Subnet 1 ifs.lan) // reservations.lan.v4)
+      # (mkDhcp4Subnet 10 ifs.lan10)
+      ((mkDhcp4Subnet 20 ifs.lan20) // reservations.lan20.v4)
+      (mkDhcp4Subnet 30 ifs.lan30)
+      (mkDhcp4Subnet 40 ifs.lan40)
       (mkDhcp4Subnet 50 ifs.lan50)
     ];
   };
@@ -439,22 +636,19 @@ in
     interfaces-config.interfaces = [
       ifs.lan.name
       # ifs.lan10.name
-      # ifs.lan20.name
+      # ifs.lan20.name  # Managed by Att box
+      ifs.lan30.name
+      ifs.lan40.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 = "6.default.${ldomain}";
     subnet6 = [
-      ((mkDhcp6Subnet 1 ifs.lan) // {
-        reservations = [
-          {
-            duid = "00:04:59:c3:ce:9a:08:cf:fb:b7:fe:74:9c:e3:b7:44:bf:01";
-            hostname = "archy";
-            ip-addresses = [ "${ifs.lan.p6}::69" ];
-          }
-        ];
-      })
+      ((mkDhcp6Subnet 1 ifs.lan) // reservations.lan.v6)
+      # (mkDhcp6Subnet 10 ifs.lan10)
+      (mkDhcp6Subnet 30 ifs.lan30)
+      (mkDhcp6Subnet 40 ifs.lan40)
       (mkDhcp6Subnet 50 ifs.lan50)
     ];
   };
@@ -481,16 +675,27 @@ in
       upstream_dns = [
         "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)
       ];
     };
     # https://adguard-dns.io/kb/general/dns-filtering-syntax/
     user_rules = [
       # DNS rewrites
       "|grouter.${domain}^$dnsrewrite=${ifs.lan.ulaAddr}"
+      "|pve-1.${sysdomain}^$dnsrewrite=${ifs.lan.p4}.5"
+      "|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"
+
+      "||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=${ifs.lan.p6}:1cd5:56ff:feec:c74a") alpinaDomains
+      ++ map (host: "${host}${domain}^$dnsrewrite=${ifs.lan.p4}.11") alpinaDomains;
   };
 
   services.knot.enable = true;

modules/mods/kb-input.nix

@@ -9,11 +9,21 @@ in {
   options = {
     mods.kb-input = {
       enable = lib.mkEnableOption "input method and custom keyboard layout";
+      enableMinimak = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Enable Minimak keyboard layout";
+      };
+      enableFcitx = lib.mkOption {
+        type = lib.types.bool;
+        default = true;
+        description = "Enable Fcitx5 input method";
+      };
     };
   };
 
   config = lib.mkIf cfg.enable {
-    services.xserver.xkb.extraLayouts = {
+    services.xserver.xkb.extraLayouts = lib.mkIf cfg.enableMinimak {
       minimak-4 = {
         description = "English (US, Minimak-4)";
         languages = [ "eng" ];
@@ -31,12 +41,12 @@ in {
       };
     };
 
-    i18n.inputMethod = {
-      type = "fcitx5";
+    i18n.inputMethod = lib.mkIf cfg.enableFcitx {
       enable = true;
+      type = "fcitx5";
       fcitx5.waylandFrontend = true;
       fcitx5.plasma6Support = true;
       fcitx5.addons = [ pkgs.fcitx5-mozc ];
     };
   };
-}
+}