From 35733c66454cf0ce153a9730be77d51223397933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Fri, 16 Feb 2024 00:09:45 +0100 Subject: nixos/spt-omnia: migrate to nixos --- nixos/machine/spt-omnia.nix | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'nixos/machine/spt-omnia.nix') diff --git a/nixos/machine/spt-omnia.nix b/nixos/machine/spt-omnia.nix index 15cabb6..c0a6ec2 100644 --- a/nixos/machine/spt-omnia.nix +++ b/nixos/machine/spt-omnia.nix @@ -47,31 +47,35 @@ with lib; { }; "end2.848" = { matchConfig.Name = "end2.848"; + networkConfig.BindCarrier = "end2"; + }; + "pppoe-wan" = { + matchConfig.Name = "pppoe-wan"; networkConfig = { - BindCarrier = "end2"; - #DHCP = "ipv6"; - #IPv6AcceptRA = "yes"; - #DHCPPrefixDelegation = "yes"; + BindCarrier = "end2.848"; + DHCP = "ipv6"; + IPv6AcceptRA = "yes"; + DHCPPrefixDelegation = "yes"; + }; + dhcpPrefixDelegationConfig = { + UplinkInterface = ":self"; + SubnetId = 0; + Announce = "no"; }; - #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;} - ]; + #bridgeVLANs = [ + # { + # bridgeVLANConfig = { + # EgressUntagged = 1; + # PVID = 1; + # }; + # } + # {bridgeVLANConfig.VLAN = 2;} + #]; }; }; }; -- cgit v1.2.3