nixos: work little bit on routers

1 files changed, 26 insertions, 22 deletions

diff --git a/nixos/machine/spt-mox2.nix b/nixos/machine/spt-mox2.nix
index 5922278..a3de15d 100644
--- a/nixos/machine/spt-mox2.nix
+++ b/nixos/machine/spt-mox2.nix
@@ -20,28 +20,32 @@ with lib;
     #    '';
     #}];
 
-    networking.hostapd = {
-      "mlan0" = {
-        countryCode = "CZ";
-        ssid = "TurrisRules";
-        wpa = true;
-        wpaPskFile = "/run/secrets/wifi/TurrisRules.psk";
-      };
-      "wlp1s0" = {
-        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 = "TurrisRules5";
-        wpa = true;
-        wpaPskFile = "/run/secrets/wifi/TurrisRules5.psk";
-        bss = {
-          "wlp1s0host" = {
-            ssid = "NixTurris5Guest";
-            wpa = true;
-            wpaPassphrase = "somepassword";
+    networking.wirelessAP = {
+      enable = true;
+      environmentFile = "/run/secrets/hostapd.env";
+      interfaces = {
+        "mlan0" = {
+          countryCode = "CZ";
+          ssid = "TurrisRules";
+          wpa = true;
+          wpaPassphrase = "@PASS_TURRIS_RULES@";
+        };
+        "wlp1s0" = {
+          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 = "TurrisRules5";
+          wpa = true;
+          wpaPassphrase = "@PASS_TURRIS_RULES@";
+          bss = {
+            "wlp1s0host" = {
+              ssid = "KocoviGuest";
+              wpa = true;
+              wpaPassphrase = "@PASS_KOCOVI@";
+            };
           };
         };
       };