2 files changed, 74 insertions, 78 deletions
diff --git a/nixos/routers/wifi-adm.nix b/nixos/routers/wifi-adm.nix
index 6d7aee0..339f4ef 100644
--- a/nixos/routers/wifi-adm.nix
+++ b/nixos/routers/wifi-adm.nix
@@ -34,58 +34,56 @@ in {
       environmentFile = "/run/secrets/hostapd.env";
       interfaces =
         (optionalAttrs (cnf.ar9287.interface != null) {
-          "${cnf.ar9287.interface}" =
-            hostapd.qualcomAtherosAR9287 {
-              channel = cnf.ar9287.channel;
-              bssid = "@BSSID_AR9287_0@";
-              ssid = "TurrisAdamkovi";
-              wpa = 2;
-              wpaPassphrase = "@PASS_TURRIS_ADAMKOVI@";
-              bridge = "brlan";
-              bss = {
-                "${cnf.ar9287.interface}.nela" = {
-                  bssid = "@BSSID_AR9287_1@";
-                  ssid = "Nela";
-                  wpa = 2;
-                  wpaPassphrase = "@PASS_NELA@";
-                  bridge = "brguest";
-                };
-                "${cnf.ar9287.interface}.milan" = {
-                  bssid = "@BSSID_AR9287_2@";
-                  ssid = "MILAN-AC";
-                  wpa = 2;
-                  wpaPassphrase = "@PASS_MILAN_AC@";
-                  bridge = "brguest";
-                };
+          "${cnf.ar9287.interface}" = hostapd.qualcomAtherosAR9287 {
+            channel = cnf.ar9287.channel;
+            bssid = "@BSSID_AR9287_0@";
+            ssid = "TurrisAdamkovi";
+            wpa = 2;
+            wpaPassphrase = "@PASS_TURRIS_ADAMKOVI@";
+            bridge = "brlan";
+            bss = {
+              "${cnf.ar9287.interface}.nela" = {
+                bssid = "@BSSID_AR9287_1@";
+                ssid = "Nela";
+                wpa = 2;
+                wpaPassphrase = "@PASS_NELA@";
+                bridge = "brguest";
+              };
+              "${cnf.ar9287.interface}.milan" = {
+                bssid = "@BSSID_AR9287_2@";
+                ssid = "MILAN-AC";
+                wpa = 2;
+                wpaPassphrase = "@PASS_MILAN_AC@";
+                bridge = "brguest";
               };
             };
+          };
         })
         // (optionalAttrs (cnf.qca988x.interface != null) {
-          "${cnf.qca988x.interface}" =
-            hostapd.qualcomAtherosQCA988x {
-              channel = cnf.qca988x.channel;
-              bssid = "@BSSID_AR9287_0@";
-              ssid = "TurrisAdamkovi5";
-              wpa = 2;
-              wpaPassphrase = "@PASS_TURRIS_ADAMKOVI@";
-              bridge = "brlan";
-              bss = {
-                "${cnf.qca988x.interface}.nela" = {
-                  bssid = "@BSSID_AR9287_1@";
-                  ssid = "Nela5";
-                  wpa = 2;
-                  wpaPassphrase = "@PASS_NELA@";
-                  bridge = "brguest";
-                };
-                "${cnf.qca988x.interface}.milan" = {
-                  bssid = "@BSSID_AR9287_2@";
-                  ssid = "MILAN-AC";
-                  wpa = 2;
-                  wpaPassphrase = "@PASS_MILAN_AC@";
-                  bridge = "brguest";
-                };
+          "${cnf.qca988x.interface}" = hostapd.qualcomAtherosQCA988x {
+            channel = cnf.qca988x.channel;
+            bssid = "@BSSID_AR9287_0@";
+            ssid = "TurrisAdamkovi5";
+            wpa = 2;
+            wpaPassphrase = "@PASS_TURRIS_ADAMKOVI@";
+            bridge = "brlan";
+            bss = {
+              "${cnf.qca988x.interface}.nela" = {
+                bssid = "@BSSID_AR9287_1@";
+                ssid = "Nela5";
+                wpa = 2;
+                wpaPassphrase = "@PASS_NELA@";
+                bridge = "brguest";
+              };
+              "${cnf.qca988x.interface}.milan" = {
+                bssid = "@BSSID_AR9287_2@";
+                ssid = "MILAN-AC";
+                wpa = 2;
+                wpaPassphrase = "@PASS_MILAN_AC@";
+                bridge = "brguest";
               };
             };
+          };
         });
     };
   };
diff --git a/nixos/routers/wifi-spt.nix b/nixos/routers/wifi-spt.nix
index a7b2697..69e8376 100644
--- a/nixos/routers/wifi-spt.nix
+++ b/nixos/routers/wifi-spt.nix
@@ -34,44 +34,42 @@ in {
       environmentFile = "/run/secrets/hostapd.env";
       interfaces =
         (optionalAttrs (cnf.ar9287.interface != null) {
-          "${cnf.ar9287.interface}" =
-            hostapd.qualcomAtherosAR9287 {
-              channel = cnf.ar9287.channel;
-              bssid = "@BSSID_AR9287_0@";
-              ssid = "TurrisRules";
-              wpa = 2;
-              wpaPassphrase = "@PASS_TURRIS_RULES@";
-              bridge = "brlan";
-              bss = {
-                "${cnf.ar9287.interface}.guest" = {
-                  bssid = "@BSSID_AR9287_1@";
-                  ssid = "Kocovi";
-                  wpa = 2;
-                  wpaPassphrase = "@PASS_KOCOVI@";
-                  bridge = "brguest";
-                };
+          "${cnf.ar9287.interface}" = hostapd.qualcomAtherosAR9287 {
+            channel = cnf.ar9287.channel;
+            bssid = "@BSSID_AR9287_0@";
+            ssid = "TurrisRules";
+            wpa = 2;
+            wpaPassphrase = "@PASS_TURRIS_RULES@";
+            bridge = "brlan";
+            bss = {
+              "${cnf.ar9287.interface}.guest" = {
+                bssid = "@BSSID_AR9287_1@";
+                ssid = "Kocovi";
+                wpa = 2;
+                wpaPassphrase = "@PASS_KOCOVI@";
+                bridge = "brguest";
               };
             };
+          };
         })
         // (optionalAttrs (cnf.qca988x.interface != null) {
-          "${cnf.qca988x.interface}" =
-            hostapd.qualcomAtherosQCA988x {
-              channel = cnf.qca988x.channel;
-              bssid = "@BSSID_QCA988X_0@";
-              ssid = "TurrisRules5";
-              wpa = 2;
-              wpaPassphrase = "@PASS_TURRIS_RULES@";
-              bridge = "brlan";
-              bss = {
-                "${cnf.qca988x.interface}.guest" = {
-                  bssid = "@BSSID_QCA988X_1@";
-                  ssid = "Kocovi";
-                  wpa = 2;
-                  wpaPassphrase = "@PASS_KOCOVI@";
-                  bridge = "brguest";
-                };
+          "${cnf.qca988x.interface}" = hostapd.qualcomAtherosQCA988x {
+            channel = cnf.qca988x.channel;
+            bssid = "@BSSID_QCA988X_0@";
+            ssid = "TurrisRules5";
+            wpa = 2;
+            wpaPassphrase = "@PASS_TURRIS_RULES@";
+            bridge = "brlan";
+            bss = {
+              "${cnf.qca988x.interface}.guest" = {
+                bssid = "@BSSID_QCA988X_1@";
+                ssid = "Kocovi";
+                wpa = 2;
+                wpaPassphrase = "@PASS_KOCOVI@";
+                bridge = "brguest";
               };
             };
+          };
         });
     };
   };