aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2024-07-10 12:09:58 +0200
committerKarel Kočí <cynerd@email.cz>2024-07-10 12:09:58 +0200
commit622e983ee88cf683e60b031326263d649260471a (patch)
tree5621736447c5f7d9f96edf1750474c005b164442 /nixos
parent4349cada1a0637db67501354c7d8f2d14fff0650 (diff)
downloadnixos-personal-622e983ee88cf683e60b031326263d649260471a.tar.gz
nixos-personal-622e983ee88cf683e60b031326263d649260471a.tar.bz2
nixos-personal-622e983ee88cf683e60b031326263d649260471a.zip
nixos: tweak the wifi to fix functionality
Diffstat (limited to 'nixos')
-rw-r--r--nixos/configurations/adm-omnia2.nix4
-rw-r--r--nixos/modules/wifi-spt.nix72
2 files changed, 38 insertions, 38 deletions
diff --git a/nixos/configurations/adm-omnia2.nix b/nixos/configurations/adm-omnia2.nix
index 2848bd9..45b8dc4 100644
--- a/nixos/configurations/adm-omnia2.nix
+++ b/nixos/configurations/adm-omnia2.nix
@@ -14,12 +14,12 @@
wifiAP.adm = {
enable = true;
ar9287 = {
- interface = "wlp1s0";
+ interface = "wlp2s0";
bssids = ["12:f0:21:23:2b:00" "12:f0:21:23:2b:01" "12:f0:21:23:2b:02"];
channel = 11;
};
qca988x = {
- interface = "wlp2s0";
+ interface = "wlp1s0";
bssids = ["12:f0:21:23:2b:03" "12:f0:21:23:2b:04" "12:f0:21:23:2b:05"];
channel = 36;
};
diff --git a/nixos/modules/wifi-spt.nix b/nixos/modules/wifi-spt.nix
index 2ecc3a3..a74440d 100644
--- a/nixos/modules/wifi-spt.nix
+++ b/nixos/modules/wifi-spt.nix
@@ -61,14 +61,14 @@ in {
wpa_key_mgmt = mkForce "WPA-PSK"; # force use without sha256
};
};
- #"${cnf.ar9287.interface}.guest" = {
- # bssid = elemAt cnf.ar9287.bssids 1;
- # ssid = "Kocovi";
- # authentication = {
- # mode = "wpa2-sha256";
- # wpaPasswordFile = "/run/secrets/hostapd-Kocovi.pass";
- # };
- #};
+ "${cnf.ar9287.interface}.guest" = {
+ bssid = elemAt cnf.ar9287.bssids 1;
+ ssid = "Kocovi";
+ authentication = {
+ mode = "wpa2-sha256";
+ wpaPasswordFile = "/run/secrets/hostapd-Kocovi.pass";
+ };
+ };
};
};
})
@@ -107,14 +107,14 @@ in {
wpa_key_mgmt = mkForce "WPA-PSK"; # force use without sha256
};
};
- #"${cnf.qca988x.interface}.guest" = {
- # bssid = elemAt cnf.qca988x.bssids 1;
- # ssid = "Kocovi";
- # authentication = {
- # mode = "wpa2-sha256";
- # wpaPasswordFile = "/run/secrets/hostapd-Kocovi.pass";
- # };
- #};
+ "${cnf.qca988x.interface}.guest" = {
+ bssid = elemAt cnf.qca988x.bssids 1;
+ ssid = "Kocovi";
+ authentication = {
+ mode = "wpa2-sha256";
+ wpaPasswordFile = "/run/secrets/hostapd-Kocovi.pass";
+ };
+ };
};
};
})
@@ -135,16 +135,16 @@ in {
}
];
};
- #"lan-${cnf.ar9287.interface}-guest" = {
- # matchConfig.Name = "${cnf.ar9287.interface}.guest";
- # networkConfig.Bridge = "brlan";
- # bridgeVLANs = [
- # {
- # EgressUntagged = 2;
- # PVID = 2;
- # }
- # ];
- #};
+ "lan-${cnf.ar9287.interface}-guest" = {
+ matchConfig.Name = "${cnf.ar9287.interface}.guest";
+ networkConfig.Bridge = "brlan";
+ bridgeVLANs = [
+ {
+ EgressUntagged = 2;
+ PVID = 2;
+ }
+ ];
+ };
})
(mkIf (cnf.qca988x.interface != null) {
"lan-${cnf.qca988x.interface}" = {
@@ -160,16 +160,16 @@ in {
}
];
};
- #"lan-${cnf.qca988x.interface}-guest" = {
- # matchConfig.Name = "${cnf.qca988x.interface}.guest";
- # networkConfig.Bridge = "brlan";
- # bridgeVLANs = [
- # {
- # EgressUntagged = 2;
- # PVID = 2;
- # }
- # ];
- #};
+ "lan-${cnf.qca988x.interface}-guest" = {
+ matchConfig.Name = "${cnf.qca988x.interface}.guest";
+ networkConfig.Bridge = "brlan";
+ bridgeVLANs = [
+ {
+ EgressUntagged = 2;
+ PVID = 2;
+ }
+ ];
+ };
})
];
};