From b7dd9f396326ab914897900fbaa1e16a46928adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 18 Jan 2023 22:54:54 +0100 Subject: nioxos: 5GHz Wi-Fi --- nixos/machine/adm-omnia2.nix | 77 ++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 39 deletions(-) (limited to 'nixos/machine/adm-omnia2.nix') diff --git a/nixos/machine/adm-omnia2.nix b/nixos/machine/adm-omnia2.nix index cf6de9f..3a47a84 100644 --- a/nixos/machine/adm-omnia2.nix +++ b/nixos/machine/adm-omnia2.nix @@ -7,48 +7,47 @@ with lib; { config = { networking = { - bridges = { - brlan = { - interfaces = [ - "end2" - "lan0" - "lan1" - "lan2" - "lan3" - "lan4" - ]; - }; - }; - localCommands = '' - ip link set brlan type bridge vlan_filtering 1 - bridge vlan add dev eth2 vid 1 pvid untagged - bridge vlan add dev eth2 vid 2 - bridge vlan add dev lan0 vid 2 pvid untagged - bridge vlan add dev lan1 vid 2 pvid untagged - bridge vlan add dev lan2 vid 2 pvid untagged - bridge vlan add dev lan3 vid 2 pvid untagged - bridge vlan add dev lan4 vid 1 pvid untagged - bridge vlan add dev lan4 vid 2 - ''; - vlans = { - "lan" = { - id = 1; - interface = "brlan"; + bridges.brlan.interfaces = [ + "end2" "lan0" "lan1" "lan2" "lan3" "lan4" + ]; + interfaces.brlan.ipv4.addresses = [ + { + address = config.cynerd.hosts.adm.omnia2; + prefixLength = 24; + } + ]; + defaultGateway = config.cynerd.hosts.adm.omnia; + nameservers = ["1.1.1.1" "8.8.8.8"]; + dhcpcd.allowInterfaces = ["lan"]; + }; + + networking.wirelessAP = { + enable = true; + environmentFile = "/run/secrets/hostapd.env"; + interfaces = { + "wlp2s0" = { + countryCode = "CZ"; + hwMode = "a"; + channel = 36; + ieee80211ac = true; + ht_capab = ["HT40+" "LDPC" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "DSSS_CCK-40"]; + vht_capab = ["RXLDPC" "SHORT-GI-80" "TX-STBC-2BY1" "RX-ANTENNA-PATTERN" "TX-ANTENNA-PATTERN" "RX-STBC-1" "MAX-MPDU-11454" "MAX-A-MPDU-LEN-EXP7"]; + ssid = "TurrisAdamkovi5"; + wpa = 2; + wpaPassphrase = "@PASS_TURRIS_ADAMKOVI@"; + bridge = "brlan"; }; - }; - interfaces.lan = { - ipv4 = { - addresses = [ - { - address = config.cynerd.hosts.adm.omnia2; - prefixLength = 24; - } - ]; + "wlp3s0" = { + countryCode = "CZ"; + hwMode = "g"; + channel = 7; + ht_capab = ["HT40+" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "DSSS_CCK-40"]; + ssid = "TurrisAdamkovi"; + wpa = 2; + wpaPassphrase = "@PASS_TURRIS_ADAMKOVI@"; + bridge = "brlan"; }; }; - defaultGateway = config.cynerd.hosts.adm.omnia; - nameservers = [config.cynerd.hosts.adm.omnia "1.1.1.1" "8.8.8.8"]; - dhcpcd.allowInterfaces = ["lan"]; }; }; } -- cgit v1.2.3