add new wifi connection + simplify helpers

This commit is contained in:
Aly Raffauf 2024-06-30 22:52:23 -04:00
parent aae162d0c9
commit 74157fbdc2
2 changed files with 26 additions and 50 deletions

View file

@ -35,60 +35,36 @@
}; };
}; };
mkWPAWiFi = ssid: psk: { mkWPAWiFi = ssid: psk: (
connection = { (mkOpenWiFi ssid)
id = "${ssid}"; // {
type = "wifi";
};
ipv4.method = "auto";
ipv6 = {
addr-gen-mode = "default";
method = "auto";
};
wifi = {
mode = "infrastructure";
ssid = "${ssid}";
};
wifi-security = { wifi-security = {
auth-alg = "open"; auth-alg = "open";
key-mgmt = "wpa-psk"; key-mgmt = "wpa-psk";
psk = "${psk}"; psk = "${psk}";
}; };
}; }
);
mkEAPWiFi = ssid: identity: pass: auth: { mkEAPWiFi = ssid: identity: pass: auth: (
(mkOpenWiFi ssid)
// {
"802-1x" = { "802-1x" = {
eap = "PEAP"; eap = "peap;";
identity = "${identity}"; identity = "${identity}";
password = "${pass}"; password = "${pass}";
phase2-auth = "${auth}"; phase2-auth = "${auth}";
}; };
connection = { wifi-security = {
id = "${ssid}"; auth-alg = "open";
type = "wifi"; key-mgmt = "wpa-eap";
};
ipv4.method = "auto";
ipv6 = {
addr-gen-mode = "default";
method = "auto";
};
wifi = {
mode = "infrastructure";
ssid = "${ssid}";
};
wifi-security.key-mgmt = "wpa-eap";
}; };
}
);
in { in {
"Dustin's A54" = mkWPAWiFi "Dustin's A54" "$DustinsA54PSK"; "Dustin's A54" = mkWPAWiFi "Dustin's A54" "$DustinsA54PSK";
"FCS-WiFi2" = mkEAPWiFi "FCS-WiFi2" "$FCSIdentity" "$FCSPassword" "mschapv2";
"javapatron" = mkOpenWiFi "javapatron"; "javapatron" = mkOpenWiFi "javapatron";
"Stargate-Discovery" = mkWPAWiFi "Stargate-Discovery" "$StargateDiscoveryPSK"; "Stargate-Discovery" = mkWPAWiFi "Stargate-Discovery" "$StargateDiscoveryPSK";
"Taproom Public WiFi" = mkOpenWiFi "Taproom Public WiFi"; "Taproom Public WiFi" = mkOpenWiFi "Taproom Public WiFi";

Binary file not shown.