Update nixpkgs 2025-12-16-02-03

flake.lock

@@ -650,11 +650,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1764667669,
+        "lastModified": 1765779637,
-        "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
+        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "418468ac9527e799809c900eda37cbff999199b6",
+        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
         "type": "github"
       },
       "original": {

hosts/carbon/configuration.nix

@@ -7,18 +7,13 @@
 
       ./dns.nix
       ./ds-lite-ncfttb.nix
-      ./mdns.nix
       ./net-dsl.nix
-      ./net-gastnetz.nix
       ./net-heimnetz.nix
       ./net-iot.nix
-      ./net-lte.nix
       ./net-mgmt.nix
       ./net-printer.nix
-      ./net-voip.nix
       ./ntp.nix
       ./ppp-ncfttb.nix
-      ./scan-to-gpg.nix
       ./wg-clerie.nix
     ];
 
@@ -37,14 +32,6 @@
 
   networking.useDHCP = false;
 
-  networking.nat = {
-    enableIPv6 = true;
-    enable = true;
-    externalInterface = "ppp-ncfttb";
-    internalIPv6s = [ "fd00:152:152::/48" "fd00:3214:9453:4920::/64"];
-    internalIPs = [ "10.152.0.0/16" "192.168.32.0/24" ];
-  };
-
   services.radvd.enable = true;
 
   services.kea.dhcp4 = {

hosts/carbon/mdns.nix

@@ -1,17 +0,0 @@
-{ pkgs, ... }:
-
-{
-
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-
-    allowInterfaces = [
-      "net-heimnetz"
-      "net-iot"
-    ];
-
-    reflector = true;
-  };
-
-}

hosts/carbon/net-gastnetz.nix

@@ -1,69 +0,0 @@
-{ ... }:
-
-{
-
-  ## Gastnetz
-  networking.vlans."enp1s0.202" = {
-    id = 202;
-    interface = "enp1s0";
-  };
-  networking.bridges."net-gastnetz".interfaces = [
-    "enp1s0.202"
-  ];
-  networking.interfaces."net-gastnetz".ipv6.addresses = [
-    { address = "fd00:3214:9453:4920::1"; prefixLength = 64; }
-  ];
-  networking.interfaces."net-gastnetz".ipv4.addresses = [
-    { address = "192.168.32.1"; prefixLength = 24; }
-  ];
-
-  services.radvd.config = ''
-    interface net-gastnetz {
-      AdvSendAdvert on;
-      MaxRtrAdvInterval 30;
-      prefix ::/64 {
-        AdvValidLifetime 300;
-        AdvPreferredLifetime 120;
-      };
-      RDNSS 2620:fe::fe 2620:fe::9 {}; # Quad 9
-    };
-  '';
-
-  services.kea.dhcp4 = {
-    settings = {
-      interfaces-config = {
-        interfaces = [ "net-gastnetz" ];
-      };
-      subnet4 = [
-        # Gastnetz
-        {
-          id = 202;
-          subnet = "192.168.32.0/24";
-          pools = [
-            {
-              pool = "192.168.32.100 - 192.168.32.240";
-            }
-          ];
-          option-data = [
-            {
-              name = "routers";
-              data = "192.168.32.1";
-            }
-            {
-              name = "domain-name-servers";
-              data = "9.9.9.9,149.112.112.112"; # Quad 9
-            }
-          ];
-        }
-      ];
-    };
-  };
-
-  # net-gastnetz can only access internet
-  clerie.firewall.extraForwardFilterCommands = ''
-    ip46tables -A forward-filter -i net-gastnetz -o ppp-ncfttb -j ACCEPT
-    ip46tables -A forward-filter -i net-gastnetz -j DROP
-    ip46tables -A forward-filter -o net-gastnetz -j DROP
-  '';
-
-}

hosts/carbon/net-iot.nix

@@ -6,22 +6,19 @@
     id = 205;
     interface = "enp1s0";
   };
-  networking.bridges."net-iot".interfaces = [
+  networking.interfaces."enp1s0.205".ipv6.addresses = [
-    "enp1s0.205"
-  ];
-  networking.interfaces."net-iot".ipv6.addresses = [
     { address = "fe80::1"; prefixLength = 64; }
     { address = "fd00:152:152:205::1"; prefixLength = 64; }
   ];
-  networking.interfaces."net-iot".ipv4.addresses = [
+  networking.interfaces."enp1s0.205".ipv4.addresses = [
     { address = "10.152.205.1"; prefixLength = 24; }
   ];
 
   # Enable NTP
-  networking.firewall.interfaces."net-iot".allowedUDPPorts = [ 123 ];
+  networking.firewall.interfaces."enp1s0.205".allowedUDPPorts = [ 123 ];
 
   services.radvd.config = ''
-    interface net-iot {
+    interface enp1s0.205 {
       AdvSendAdvert on;
       MaxRtrAdvInterval 30;
       prefix ::/64 {
@@ -36,7 +33,7 @@
   services.kea.dhcp4 = {
     settings = {
       interfaces-config = {
-        interfaces = [ "net-iot" ];
+        interfaces = [ "enp1s0.205" ];
       };
       subnet4 = [
         {
@@ -72,9 +69,9 @@
 
   clerie.firewall.extraForwardFilterCommands = ''
     # Allow access from Heimnetz to IOT devices
-    ip46tables -A forward-filter -i net-heimnetz -o net-iot -j ACCEPT
+    ip46tables -A forward-filter -i enp2s0 -o enp1s0.205 -j ACCEPT
-    ip46tables -A forward-filter -i net-iot -j DROP
+    ip46tables -A forward-filter -i enp1s0.205 -j DROP
-    ip46tables -A forward-filter -o net-iot -j DROP
+    ip46tables -A forward-filter -o enp1s0.205 -j DROP
   '';
 
 }

hosts/carbon/net-lte.nix

@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-
-  ## LTE-Uplink
-  networking.vlans."enp1s0.102" = {
-    id = 102;
-    interface = "enp1s0";
-  };
-
-}

hosts/carbon/net-mgmt.nix

@@ -6,19 +6,16 @@
     id = 203;
     interface = "enp1s0";
   };
-  networking.bridges."net-mgmt".interfaces = [
+  networking.interfaces."enp1s0.203".ipv6.addresses = [
-    "enp1s0.203"
-  ];
-  networking.interfaces."net-mgmt".ipv6.addresses = [
     { address = "fe80::1"; prefixLength = 64; }
     { address = "fd00:152:152:203::1"; prefixLength = 64; }
   ];
-  networking.interfaces."net-mgmt".ipv4.addresses = [
+  networking.interfaces."enp1s0.203".ipv4.addresses = [
     { address = "10.152.203.1"; prefixLength = 24; }
   ];
 
   services.radvd.config = ''
-    interface net-mgmt {
+    interface enp1s0.203 {
       AdvSendAdvert on;
       MaxRtrAdvInterval 30;
       prefix ::/64 {
@@ -31,7 +28,7 @@
   services.kea.dhcp4 = {
     settings = {
       interfaces-config = {
-        interfaces = [ "net-mgmt" ];
+        interfaces = [ "enp1s0.203" ];
       };
       subnet4 = [
         {
@@ -55,9 +52,9 @@
 
   clerie.firewall.extraForwardFilterCommands = ''
     # Allow access from Heimnetz to MGMT network
-    ip46tables -A forward-filter -i net-heimnetz -o net-mgmt -j ACCEPT
+    ip46tables -A forward-filter -i enp2s0 -o enp1s0.203 -j ACCEPT
-    ip46tables -A forward-filter -i net-mgmt -j DROP
+    ip46tables -A forward-filter -i enp1s0.203 -j DROP
-    ip46tables -A forward-filter -o net-mgmt -j DROP
+    ip46tables -A forward-filter -o enp1s0.203 -j DROP
   '';
 
 }

hosts/carbon/net-printer.nix

@@ -5,17 +5,14 @@
     id = 206;
     interface = "enp1s0";
   };
-  networking.bridges."net-printer".interfaces = [
+  networking.interfaces."enp1s0.206".ipv4.addresses = [
-    "enp1s0.206"
-  ];
-  networking.interfaces."net-printer".ipv4.addresses = [
     { address = "10.152.206.1"; prefixLength = 24; }
   ];
 
   services.kea.dhcp4 = {
     settings = {
       interfaces-config = {
-        interfaces = [ "net-printer" ];
+        interfaces = [ "enp1s0.206" ];
       };
       subnet4 = [
         {
@@ -37,15 +34,11 @@
     };
   };
 
-  # Enable scan-to-gpg
-  networking.firewall.interfaces."net-printer".allowedTCPPorts = [ 2121 ];
-  networking.firewall.interfaces."net-printer".allowedTCPPortRanges = [ { from = 2130; to = 2134; } ];
-
   clerie.firewall.extraForwardFilterCommands = ''
     # Allow access from Heimnetz to printer
-    ip46tables -A forward-filter -i net-heimnetz -o net-printer -j ACCEPT
+    ip46tables -A forward-filter -i enp2s0 -o enp1s0.206 -j ACCEPT
-    ip46tables -A forward-filter -i net-printer -j DROP
+    ip46tables -A forward-filter -i enp1s0.206 -j DROP
-    ip46tables -A forward-filter -o net-printer -j DROP
+    ip46tables -A forward-filter -o enp1s0.206 -j DROP
   '';
 
 }

hosts/carbon/net-voip.nix

@@ -1,105 +0,0 @@
-{ ... }:
-
-{
-
-  ## VoIP
-  networking.vlans."enp1s0.204" = {
-    id = 204;
-    interface = "enp1s0";
-  };
-  networking.interfaces."enp1s0.204".ipv4.addresses = [
-    { address = "10.152.33.1"; prefixLength = 24; }
-  ];
-
-  services.kea.dhcp4 = {
-    settings = {
-      interfaces-config = {
-        interfaces = [ "enp1s0.204" ];
-      };
-      option-def = [
-        {
-          space = "dhcp4";
-          name = "vendor-encapsulated-options";
-          code = 43;
-          type = "empty";
-          encapsulate = "sipdect";
-        }
-        {
-          space = "sipdect";
-          name = "ommip1";
-          code = 10;
-          type = "ipv4-address";
-        }
-        {
-          space = "sipdect";
-          name = "ommip2";
-          code = 19;
-          type = "ipv4-address";
-        }
-        {
-          space = "sipdect";
-          name = "syslogip";
-          code = 14;
-          type = "ipv4-address";
-        }
-        {
-          space = "sipdect";
-          name = "syslogport";
-          code = 15;
-          type = "int16";
-        }
-        {
-          space = "dhcp4";
-          name = "magic_str";
-          code = 224;
-          type = "string";
-        }
-      ];
-      subnet4 = [
-        # VoIP
-        {
-          id = 204;
-          subnet = "10.152.33.0/24";
-          pools = [
-            {
-              pool = "10.152.33.10 - 10.152.33.200";
-            }
-          ];
-          option-data = [
-            {
-              name = "routers";
-              data = "10.152.33.1";
-            }
-          ];
-
-          reservations = [
-            {
-              hostname = "iridium";
-              hw-address = "00:30:42:1B:8C:7C";
-              ip-address = "10.152.33.11";
-              option-data = [
-                {
-                  name = "host-name";
-                  data = "iridium";
-                }
-                {
-                  name = "vendor-encapsulated-options";
-                }
-                {
-                  space = "sipdect";
-                  name = "ommip1";
-                  data = "10.152.33.11";
-                }
-                {
-                  name = "magic_str";
-                  data = "OpenMobilitySIP-DECT";
-                }
-              ];
-            }
-          ];
-        }
-      ];
-    };
-  };
-
-}

hosts/carbon/ppp-ncfttb.nix

@@ -56,6 +56,46 @@
     ];
   };
 
+  environment.etc."ppp/ipv6-up" = {
+    text = ''
+      #! ${pkgs.runtimeShell} -e
+
+      ${pkgs.systemd}/bin/systemctl restart --no-block "ppp-setup-interface-queues@''${IFNAME}.service"
+      ${pkgs.systemd}/bin/systemctl restart --no-block ds-lite-dhcpcd.service
+    '';
+    mode = "555";
+  };
+
+  systemd.services."ppp-setup-interface-queues@".serviceConfig = let
+    setup-interface-queues = pkgs.clerie-build-support.writePythonScript {
+      name = "setup-interface-queues";
+      text = ''
+        import multiprocessing
+        from pathlib import Path
+        import sys
+
+        interface_name = sys.argv[1]
+
+        print(f"New ppp interface: {interface_name}")
+
+        num_cpus = multiprocessing.cpu_count()
+
+        print(f"Detected {num_cpus} cpus")
+
+        bitmask = "1" * num_cpus
+        hexmask = "{:x}".format(int(bitmask, 2))
+
+        rps_cpus = Path(f"/sys/class/net/{interface_name}/queues/rx-0/rps_cpus")
+        rps_cpus.write_text(hexmask)
+
+        print(f"Wrote hexmask {hexmask} to {rps_cpus}")
+      '';
+   };
+  in {
+    Type = "oneshot";
+    ExecStart = "${lib.getExe setup-interface-queues} %i";
+  };
+
   clerie.firewall.extraForwardMangleCommands = ''
     ip46tables -t mangle -A forward-mangle -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu
   '';

hosts/carbon/scan-to-gpg.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-
-{
-
-  services.scan-to-gpg = {
-    enable = true;
-    gpgkey = "${pkgs.clerie-keys}/gpg/clerie@clerie.de.asc";
-  };
-
-  users.users."clerie".extraGroups = [ "scan-to-gpg" ];
-}