diff options
author | Karel Kočí <cynerd@email.cz> | 2024-01-27 13:20:03 +0100 |
---|---|---|
committer | Karel Kočí <cynerd@email.cz> | 2024-01-27 13:20:03 +0100 |
commit | c1a76b4403edcf5e2a147d68b7bbdf1c33ac95ef (patch) | |
tree | 95b00eb500c49c3358b3f736eae9cfe9165f354a /nixos/machine/adm-omnia.nix | |
parent | 6b0bc35f83a14ee9f9a34e1af782f1ef4c363d6e (diff) | |
download | nixos-personal-c1a76b4403edcf5e2a147d68b7bbdf1c33ac95ef.tar.gz nixos-personal-c1a76b4403edcf5e2a147d68b7bbdf1c33ac95ef.tar.bz2 nixos-personal-c1a76b4403edcf5e2a147d68b7bbdf1c33ac95ef.zip |
Rework routers to use systemd-networkd
Diffstat (limited to 'nixos/machine/adm-omnia.nix')
-rw-r--r-- | nixos/machine/adm-omnia.nix | 68 |
1 files changed, 48 insertions, 20 deletions
diff --git a/nixos/machine/adm-omnia.nix b/nixos/machine/adm-omnia.nix index fd6d654..088481f 100644 --- a/nixos/machine/adm-omnia.nix +++ b/nixos/machine/adm-omnia.nix @@ -9,7 +9,7 @@ with lib; { cynerd = { router = { enable = true; - wan = "end2"; # TODO pppoe-wan + wan = "pppoe-wan"; lanIP = config.cynerd.hosts.adm.omnia; }; wifiAP.adm = { @@ -21,8 +21,53 @@ with lib; { monitoring.speedtest = true; }; + networking.useDHCP = false; + systemd.network = { + networks = { + "end2" = { + matchConfig.Name = "end2"; + #networkConfig = { + # DHCP = "ipv6"; + # IPv6AcceptRA = "yes"; + # DHCPPrefixDelegation = "yes"; + #}; + #dhcpPrefixDelegationConfig = { + # UplinkInterface = ":self"; + # SubnetId = 0; + # Announce = "no"; + #}; + linkConfig.RequiredForOnline = "routable"; + }; + "lan-brlan" = { + matchConfig.Name = "lan[1-4]"; + networkConfig.Bridge = "brlan"; + bridgeVLANs = [ + { + bridgeVLANConfig = { + EgressUntagged = 1; + PVID = 1; + }; + } + {bridgeVLANConfig.VLAN = 2;} + ]; + }; + "lan0-guest" = { + matchConfig.Name = "lan0"; + networkConfig.Bridge = "brlan"; + bridgeVLANs = [ + { + bridgeVLANConfig = { + EgressUntagged = 2; + PVID = 2; + }; + } + ]; + }; + }; + }; + services.pppd = { - enable = false; + enable = true; peers."wan".config = '' plugin pppoe.so end2 ifname pppoe-wan @@ -38,23 +83,6 @@ with lib; { password 02 ''; }; - #systemd.services."pppd-wan".after = ["sys-subsystem-net-devices-end2.device"]; - - environment.systemPackages = [pkgs.tcpdump]; - - networking = { - useNetworkd = true; - useDHCP = false; - }; - systemd.network.networks = { - "lan-brlan" = { - matchConfig.Name = "lan[1-4]"; - networkConfig.Bridge = "brlan"; - }; - "lan0-brguest" = { - matchConfig.Name = "lan0"; - networkConfig.Bridge = "brguest"; - }; - }; + systemd.services."pppd-wan".after = ["sys-subsystem-net-devices-end2.device"]; }; } |