diff options
author | Karel Kočí <cynerd@email.cz> | 2024-03-14 09:35:13 +0100 |
---|---|---|
committer | Karel Kočí <cynerd@email.cz> | 2024-03-14 09:35:13 +0100 |
commit | b2ec9599373c7e0f5428694c5712c8fc0be06264 (patch) | |
tree | 331d4c70ad7664fb9fdbe9ce1050de02e231e6a2 /nixos/machine/spt-omniax.nix | |
parent | 927fab5c6ec204ce2d7ddac3901519c023331c89 (diff) | |
download | nixos-personal-b2ec9599373c7e0f5428694c5712c8fc0be06264.tar.gz nixos-personal-b2ec9599373c7e0f5428694c5712c8fc0be06264.tar.bz2 nixos-personal-b2ec9599373c7e0f5428694c5712c8fc0be06264.zip |
Load of updates and module simplification
Diffstat (limited to 'nixos/machine/spt-omniax.nix')
-rw-r--r-- | nixos/machine/spt-omniax.nix | 88 |
1 files changed, 40 insertions, 48 deletions
diff --git a/nixos/machine/spt-omniax.nix b/nixos/machine/spt-omniax.nix index 9bdc3d3..8edef49 100644 --- a/nixos/machine/spt-omniax.nix +++ b/nixos/machine/spt-omniax.nix @@ -1,56 +1,48 @@ { - config, - lib, - pkgs, - ... -}: -with lib; { - config = { - cynerd = { - router = { - enable = true; - wan = "end2"; - lanIP = "192.168.2.1"; - }; - wifiAP.spt = { - enable = true; - ar9287.interface = "wlp3s0"; - qca988x.interface = "wlp2s0"; - }; - monitoring.speedtest = true; + cynerd = { + router = { + enable = true; + wan = "end2"; + lanIP = "192.168.2.1"; + }; + wifiAP.spt = { + enable = true; + ar9287.interface = "wlp3s0"; + qca988x.interface = "wlp2s0"; }; + monitoring.speedtest = true; + }; - networking.useDHCP = false; - systemd.network = { - networks = { - "end2" = { - matchConfig.Name = "end2"; - networkConfig = { - BindCarrier = "end2"; - DHCP = "yes"; - IPv6AcceptRA = "yes"; - DHCPPrefixDelegation = "yes"; - }; - dhcpPrefixDelegationConfig = { - UplinkInterface = ":self"; - SubnetId = 0; - Announce = "no"; - }; - linkConfig.RequiredForOnline = "routable"; + networking.useDHCP = false; + systemd.network = { + networks = { + "end2" = { + matchConfig.Name = "end2"; + networkConfig = { + BindCarrier = "end2"; + DHCP = "yes"; + IPv6AcceptRA = "yes"; + DHCPPrefixDelegation = "yes"; }; - "lan-brlan" = { - matchConfig.Name = "lan*"; - networkConfig.Bridge = "brlan"; - bridgeVLANs = [ - { - bridgeVLANConfig = { - EgressUntagged = 1; - PVID = 1; - }; - } - {bridgeVLANConfig.VLAN = 2;} - ]; + 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;} + ]; }; }; }; |