diff options
| author | Karel Kočí <cynerd@email.cz> | 2023-02-06 19:26:20 +0100 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2023-02-06 19:26:20 +0100 |
| commit | 9394c2f649c006da6e6348ed10aa73f9586816e6 (patch) | |
| tree | 35ce4eb36cac7d28a9fd692ffe2068a84df95320 /nixos | |
| parent | b06842f6ab607e91b7e5fcce8f76e85d50d5712f (diff) | |
| download | nixos-personal-9394c2f649c006da6e6348ed10aa73f9586816e6.tar.gz nixos-personal-9394c2f649c006da6e6348ed10aa73f9586816e6.tar.bz2 nixos-personal-9394c2f649c006da6e6348ed10aa73f9586816e6.zip | |
nixos: fix formatting
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/routers/wifi-adm.nix | 90 | ||||
| -rw-r--r-- | nixos/routers/wifi-spt.nix | 62 |
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"; }; }; + }; }); }; }; |