nixos: improve wifi configuration

1 files changed, 18 insertions, 42 deletions

diff --git a/nixos/machine/spt-mox.nix b/nixos/machine/spt-mox.nix
index 84029c6..6ca780a 100644
--- a/nixos/machine/spt-mox.nix
+++ b/nixos/machine/spt-mox.nix
@@ -7,61 +7,37 @@
 with builtins;
 with lib; {
   config = {
-    cynerd.home-assistant = true;
-
-    networking.wirelessAP = {
-      enable = true;
-      environmentFile = "/run/secrets/hostapd.env";
-      interfaces = {
-        "wls1" = {
-          countryCode = "CZ";
+    cynerd = {
+      home-assistant = true;
+      wifiAP.spt = {
+        enable = true;
+        qca988x = {
+          interface = "wls1";
           channel = 7;
-          hwMode = "g";
-          ht_capab = ["HT40+" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "DSSS_CCK-40"];
-          ssid = "TurrisRules";
-          bridge = "brlan";
-          wpa = 2;
-          wpaPassphrase = "@PASS_TURRIS_RULES@";
         };
       };
     };
 
     networking = {
       vlans = {
-        "eth0.2" = {
+        "brlan.guest" = {
           id = 2;
-          interface = "eth0";
+          interface = "brlan";
         };
       };
       bridges = {
-        brlan = {
-          interfaces = [
-            "eth0"
-            "lan1"
-            "lan2"
-            "lan3"
-            "lan4"
-          ];
-        };
-        brguest = {
-          interfaces = [
-            "eth0.2"
-          ];
-        };
-      };
-      interfaces.brlan = {
-        ipv4 = {
-          addresses = [
-            {
-              address = config.cynerd.hosts.spt.mox;
-              prefixLength = 24;
-            }
-          ];
-        };
+        brlan.interfaces = ["eth0" "lan1" "lan2" "lan3" "lan4"];
+        brguest.interfaces = ["brlan.guest"];
       };
+      interfaces.brlan.ipv4.addresses = [
+        {
+          address = config.cynerd.hosts.spt.mox;
+          prefixLength = 24;
+        }
+      ];
       defaultGateway = config.cynerd.hosts.spt.omnia;
-      nameservers = [config.cynerd.hosts.spt.omnia "1.1.1.1" "8.8.8.8"];
-      dhcpcd.allowInterfaces = ["brlan"];
+      nameservers = ["1.1.1.1" "8.8.8.8"];
+      dhcpcd.allowInterfaces = [];
     };
   };
 }