1 files changed, 57 insertions, 10 deletions

diff --git a/nixos/machine/spt-omnia.nix b/nixos/machine/spt-omnia.nix
index bf72a6e..15cabb6 100644
--- a/nixos/machine/spt-omnia.nix
+++ b/nixos/machine/spt-omnia.nix
@@ -14,18 +14,68 @@ with lib; {
       };
       wifiAP.spt = {
         enable = true;
-        ar9287.interface = "wlp3s0";
-        qca988x.interface = "wlp2s0";
+        ar9287 = {
+          interface = "wlp3s0";
+          bssids = ["04:f0:21:23:16:64" "08:f0:21:23:16:64"];
+          channel = 13;
+        };
+        qca988x = {
+          interface = "wlp2s0";
+          bssids = ["04:f0:21:24:21:93" "08:f0:21:24:21:93"];
+          channel = 36;
+        };
       };
       openvpn.oldpersonal = true;
       monitoring.speedtest = true;
     };
 
-    networking.vlans."end2.848" = {
-      id = 848;
-      interface = "end2";
+    networking.useDHCP = false;
+    systemd.network = {
+      netdevs = {
+        "end2.848" = {
+          netdevConfig = {
+            Kind = "vlan";
+            Name = "end2.848";
+          };
+          vlanConfig.Id = 848;
+        };
+      };
+      networks = {
+        "end2" = {
+          matchConfig.Name = "end2";
+          networkConfig.VLAN = ["end2.848"];
+        };
+        "end2.848" = {
+          matchConfig.Name = "end2.848";
+          networkConfig = {
+            BindCarrier = "end2";
+            #DHCP = "ipv6";
+            #IPv6AcceptRA = "yes";
+            #DHCPPrefixDelegation = "yes";
+          };
+          #dhcpPrefixDelegationConfig = {
+          #  UplinkInterface = ":self";
+          #  SubnetId = 0;
+          #  Announce = "no";
+          #};
+          linkConfig.RequiredForOnline = "routable";
+        };
+        "lan-brlan" = {
+          matchConfig.Name = "lan*";
+          networkConfig.Bridge = "brlan";
+          bridgeVLANs = [
+            {
+              bridgeVLANConfig = {
+                EgressUntagged = 1;
+                PVID = 1;
+              };
+            }
+            {bridgeVLANConfig.VLAN = 2;}
+          ];
+        };
+      };
     };
-    # TODO pppd service requires end2.848 interface
+
     services.pppd = {
       enable = true;
       peers."wan".config = ''
@@ -43,10 +93,7 @@ with lib; {
         password metronet
       '';
     };
-
-    networking.bridges = {
-      brlan.interfaces = ["lan0" "lan1" "lan2" "lan3" "lan4"];
-    };
+    systemd.services."pppd-wan".after = ["sys-subsystem-net-devices-end2.848.device"];
 
     services.syncthing = {
       enable = true;