From 74157fbdc2cb0ec4d9408350679a70695e08403d Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sun, 30 Jun 2024 22:52:23 -0400
Subject: [PATCH] add new wifi connection + simplify helpers

---
 nixosModules/base/networking/default.nix |  76 ++++++++---------------
 secrets/wifi.age                         | Bin 1386 -> 1436 bytes
 2 files changed, 26 insertions(+), 50 deletions(-)

diff --git a/nixosModules/base/networking/default.nix b/nixosModules/base/networking/default.nix
index f9328aed..e914ba98 100644
--- a/nixosModules/base/networking/default.nix
+++ b/nixosModules/base/networking/default.nix
@@ -35,60 +35,36 @@
             };
           };
 
-          mkWPAWiFi = ssid: psk: {
-            connection = {
-              id = "${ssid}";
-              type = "wifi";
-            };
+          mkWPAWiFi = ssid: psk: (
+            (mkOpenWiFi ssid)
+            // {
+              wifi-security = {
+                auth-alg = "open";
+                key-mgmt = "wpa-psk";
+                psk = "${psk}";
+              };
+            }
+          );
 
-            ipv4.method = "auto";
+          mkEAPWiFi = ssid: identity: pass: auth: (
+            (mkOpenWiFi ssid)
+            // {
+              "802-1x" = {
+                eap = "peap;";
+                identity = "${identity}";
+                password = "${pass}";
+                phase2-auth = "${auth}";
+              };
 
-            ipv6 = {
-              addr-gen-mode = "default";
-              method = "auto";
-            };
-
-            wifi = {
-              mode = "infrastructure";
-              ssid = "${ssid}";
-            };
-
-            wifi-security = {
-              auth-alg = "open";
-              key-mgmt = "wpa-psk";
-              psk = "${psk}";
-            };
-          };
-
-          mkEAPWiFi = ssid: identity: pass: auth: {
-            "802-1x" = {
-              eap = "PEAP";
-              identity = "${identity}";
-              password = "${pass}";
-              phase2-auth = "${auth}";
-            };
-
-            connection = {
-              id = "${ssid}";
-              type = "wifi";
-            };
-
-            ipv4.method = "auto";
-
-            ipv6 = {
-              addr-gen-mode = "default";
-              method = "auto";
-            };
-
-            wifi = {
-              mode = "infrastructure";
-              ssid = "${ssid}";
-            };
-
-            wifi-security.key-mgmt = "wpa-eap";
-          };
+              wifi-security = {
+                auth-alg = "open";
+                key-mgmt = "wpa-eap";
+              };
+            }
+          );
         in {
           "Dustin's A54" = mkWPAWiFi "Dustin's A54" "$DustinsA54PSK";
+          "FCS-WiFi2" = mkEAPWiFi "FCS-WiFi2" "$FCSIdentity" "$FCSPassword" "mschapv2";
           "javapatron" = mkOpenWiFi "javapatron";
           "Stargate-Discovery" = mkWPAWiFi "Stargate-Discovery" "$StargateDiscoveryPSK";
           "Taproom Public WiFi" = mkOpenWiFi "Taproom Public WiFi";
diff --git a/secrets/wifi.age b/secrets/wifi.age
index d8a7ef8d8ab78222d54e8829838896afd28ce997..d80b34373c5ab49c959a5665634323cee5ba2ebf 100644
GIT binary patch
literal 1436
zcmZY8+pF6I90%|N%7*cZcwst68F(#SdP|z(nC9A(rnfXr(niMCq`9ZLG)dDGL<cez
zZ`*?&91J(a3-iJT9@zzlOonU>w}CslF(+>N;ENAFhzbt(eD)7~KYV}uzC&Hjsjf0f
z{mAs(P2NNYrv)IlB@>25P8}5?s8G$!Xm!wHGiYiHGf?HCnE_KeJ~tPkkvd`NPA87R
zIH3)w8OgjKk~#w5BXbNT6y$SGUhTDDkFMBG-_eD*Wf@fj_A1msk_I}Mw^wU=cIfx@
zOwI0s*?=4=-Kt&eF*A<On<nQ*S$mkTOl4Kd-pHP$j)2+#9*NDKZ*e%-5N8t9nKal*
zn~Ef=S1<xFA|Vtm!0mDrs5fa|xJb;Cj2sP8tS(q6#tF61Ls`fsDWT8<=OF_P)bcz^
z+s&2*x~UFWeOb@4NW;tP1Hv*%W<m$!dZAW?>BP_&jMX*Os?URAO<&zjoQI&0Wct%?
zPvRWWGtGqIry9t2`eV}VhfR;GBONy>@^0YvVXYeia9a%AA|aJ=N*vj|kBL%hqIKWN
zmpYtUSDjLn#z^c5W^=Vxn>e(LW;&A8kVTh-L2m*Ut%20wEM>$E=^k0~l`IuY`79E2
zeYh3^dW%My+@P(r8=(eUF-s|&&6SmSY7jjq6xa?IFggTIKyS6i^;oEjW?0lMm?`PZ
zbt9=ad|TF#ieV^WG=_sVl13sT;a1(s@^chm^g&`wF~VuPO0QJ~D^0M)sBRA|c@#X$
zV@hw}l_1{%op80LR7g-~GrZ#}Ln6dNI~j$we66aE{gyB^?dBMqm7-#s;JHGA+Zd4t
zB6B25&1Q*?i7u6L;h-j9*-niPlSP+C1yz&BV>2a+_1;aF6d`38=ox|0T16)ASRIap
zOAzjup{=M0r&Wg#r^I5{)k1@a<g%>*xD=H&n9;>rF!xvuPF==EQj950?bw|n)d7;v
zk1R!+EBxwig>k=JPBNBN<H=%8nd>nda{}S3gfi>U$)Gh05zMrPEh&o!JunbaAkgJF
z-}a0NUnUdTz{`wVkaQ42t(nI66UA%QIaQYj@ZwDipbS9`*bFpdXe&r1i>a2R?hx|b
z`C?O4#VLcx2r{tvM%y9F7_o>ZfP*4crlO&4y_3)ZJ}dB$EMgo65sWXS)6`_9H8Tt-
zHbH@0E|+0DSwZ$YOoif0rBRcaCPIkU@!Gskam<ZxQOkj(sq;qDwt@YVD@T&GKP;3y
zVc*J!Ywurk{_lm4#!FlF{CjfE<>S?U|141MKb-&Kp0mG3C+^~Z+xT*?aI0~CTR3a2
z+xx=jXUTsy?B4vY_1&wd`@44J-`lkO+__JzmG_^0^jbnL{rBLJKcQn=pI_Oq@cXt`
z*3-v-e&Dlh;=#wm7njx_8M{9c{2x1yo!EY<b!NPs_;&Z*mE66jE))-|-@JC|7W~k{
zPorxGUcaM@TvNV(@}Z-TS#O@)xBt4o^}wf>zeK{zr+*ngHC}Tu0-lb)e&Xtd&0pR2
z&h<kZ&7;e0`plg`<rKN{@xhC4|FyK^zH|F`E$=z}%v<Io`-<I{(B<2KawAxGwQ=7E
QZ=?&OE5gpo-Wj&;e-hUECjbBd

literal 1386
zcmZY4TdUgy003ZN4@wnbf+8D25k*)%%cZ&1;nDP#q-m4po)p2QX__=mljhQ<4R}Fu
zZobF_A7n5DMK%$1cws0E2a~x?VPkNnL)l=059&lWag%dEpX)F9_)N!MvjZz$PSa5s
z><(iGm_voN^<t8^YxV#}QK(W}Ft))7Ma%UyH3Q19go05Dr$!Xpxo4NiB-G_9S6ljW
z)F_E~;u3|_TaLA+%La{+N|D`3Qzg=pDQ6`^Vk0Q+Ql1x~<2GJzCaaoLGN-yz%tAbn
z770OD=a4(Ao5N*PZp&2AbDg;s`JT&oqo&KVTFofTbw#o<B!CQvrv_8ilgKy#+*BF+
zt@db^mI<~ub&1>~vQ;fi=z5+N=>}Ye>7-Jra(Lc{2K2}lBy(!ZDlaNB&@sX^>dB0t
zmb1b_6hS4(@RDo~&Cz(&?!XIg)N41(RY9AW3g^qLJN7V1w^lVRPXIM5js?yDNJpTX
zR$}$6NkjAy-Zxw`Mwn{XnV=2P;2aScYDz(?Q?$&4a*$IsoBEH$P`oR~NKWDdPAjV(
zzye%(3RQS!Rik2`>61mri>E`ps#lt>E>zeAh2$YJQLuJC?6&3zlLq{ZZn-Ky9v5cO
zRI>Yat}~#+=b|GvTU1Ayv1-*uxh7yKEppIyP)ydrRZWrwR3wY!Y}qq`3YtbR#x?2$
zD2A9Ijr>_1106-nSZNvsxJZlexFEO#b?(O%Yzfu6J;RvxQ6g$jD+4-g%zz*ZL2%xN
z<1T@ARy7N60FF=`rx8Ll32T-(OeY`~E|T}<whXACs(YbfIu_q&+0dW@qY#gqjx?OG
zjx?g;W#8sIlLp%g43S}JKX3$36zOWM&t<N#s%fZYMow`I3Shq^V2IMKV?2gSJ!LEm
z%6z5fD|v^?HH^}TMYRpVR>5aTD8#kNARVSWxEzC_sdQpeuMzd8#3gVF<ekpEHjBak
zY0yMRkgOOHsD!2#3b%W>GSq{4ZED&%-b>srJv5MN=0_fkx81tS6kwHwJdoi$R-Q<-
z4=#t3v>($Gy%h}tC<7+-PHaT=rOK15x2CJwkx&fe$bw9jvba%~oy;WJFzfIzo6=K(
z(dcRJlcP{qLs2i21!yoYw@tE3V;JF4rM_2+m!L(03qI15v{rHu&9}vzuJ@3_+S*!i
z=~{EJYBgvWLG*>+>-lvNhxL*_plg&I;X|k!xs(-De57zON3ZOB{EdURZydN0?7TLh
zcT4aA>t>Q2eB|c#!@q7G`fU9Yh5Zq{*ZTaSmu`Q!gWhqE^4e+SuUG2rt&R8pzPfzw
zx1%q9cmF3p9J>DdwvV2=`@+pr2KvDI*%Nzv%za-Rd0XFeYTuEcZe0A}d;R>acOE`@
z_4&<b&(7|8{oKZn_Zly6Y&$;rb4$8C?>u__nLE|ZZ+jxW_s!F{_8mJ_I<p=h{`B(E
zS5H3qb-eGv7gTQJ7vbP8`tn<wqwx6ty=Tr{+q3n=9VdRSp5Ol1rTza5cYVoT*?Rip
M)87bZzk2t=zos4R{{R30