nixos: fix formatting

3 files changed, 83 insertions, 87 deletions

diff --git a/flake.lock b/flake.lock
index 417763b..71fffb3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1674828708,
-        "narHash": "sha256-W86pFZlsFCpgGXHCyPzC/d9Oq6QzC7baYJzhaC7vdY0=",
+        "lastModified": 1675463621,
+        "narHash": "sha256-s5R0zTc5+ukzv3uQxyjx+6u/GnVxiD0myIl7tSuKnKY=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "ccaadc957593522e9b46336eb5afa45ff876f13f",
+        "rev": "895dfc656a21f6252ddf48df0d1f215effa04ecb",
         "type": "github"
       },
       "original": {
@@ -186,11 +186,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1675030625,
-        "narHash": "sha256-jjzFGjMfL2SwFa6lP6mD7KRWpUiQkzfH+lAhA4xUcRw=",
+        "lastModified": 1675578535,
+        "narHash": "sha256-lSdX9xqbvANqgldU5p9y/DVxZG/yaW3OZSvdu63NL9Y=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bea4062a62e18615421e8f4ce7bc339529f1c106",
+        "rev": "7590fa36d81157f431bf2c6f58625339912ea819",
         "type": "github"
       },
       "original": {
@@ -353,11 +353,11 @@
     },
     "vpsadminos": {
       "locked": {
-        "lastModified": 1674816878,
-        "narHash": "sha256-A8FI3p4WvxJJFufu5Er1ELpeLfNGTecd3BQGBldcmP8=",
+        "lastModified": 1675590480,
+        "narHash": "sha256-WyRPNSA2R7voMIZRVwDvNlPGJUPt8iraDDxpxH5L07g=",
         "owner": "vpsfreecz",
         "repo": "vpsadminos",
-        "rev": "173acb299e143ff61f093bdab674cc08ecd1d9bb",
+        "rev": "695611a857b7805832d1d5f3d4d08f0dbcf22217",
         "type": "github"
       },
       "original": {
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";
               };
             };
+          };
         });
     };
   };