From 37d941e25548f3c78af18e545e0cec0e2304b8aa Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.be>
Date: Sun, 15 Sep 2024 17:54:23 +0200
Subject: [PATCH] Fix wpa_supplicant passwords

---
 modules/nixos/base/network/mobile.nix |  21 +++++++++++----------
 secrets/passwords/networks.age        | Bin 679 -> 733 bytes
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/modules/nixos/base/network/mobile.nix b/modules/nixos/base/network/mobile.nix
index 22b9112c..17e831c9 100644
--- a/modules/nixos/base/network/mobile.nix
+++ b/modules/nixos/base/network/mobile.nix
@@ -30,19 +30,19 @@
           group = "network";
         };
         networks = {
-          "Public Universal Friend".pskRaw = "ext:PSK_PUF";
-          AndroidAP.pskRaw = "ext:PSK_AndroidAP";
-          draadloosnw.pskRaw = "ext:PSK_draadloosnw";
-          werknet.pskRaw = "ext:PSK_werknet";
-          Secorima.pskRaw = "ext:PSK_Secorima";
-          "down".pskRaw = "ext:PSK_down";
+          "Public Universal Friend".pskRaw = "ext:psk_puf";
+          AndroidAP.pskRaw = "ext:psk_androidap";
+          draadloosnw.pskRaw = "ext:psk_draadloosnw";
+          werknet.pskRaw = "ext:psk_werknet";
+          Secorima.pskRaw = "ext:psk_secorima";
+          "down".pskRaw = "ext:psk_down";
           "Zeus WPI" = {
-            pskRaw = "ext:PSK_Zeus";
+            pskRaw = "ext:psk_zeus";
             hidden = true;
           };
-          "Zeus Event 5G".pskRaw = "ext:PSK_Zeus";
-          "Rode Kruis-Gent (internet)".pskRaw = "ext:PSK_RKG";
-          "DasNetwerk".pskRaw = "ext:PSK_DasNetwerk";
+          "Zeus Event 5G".pskRaw = "ext:psk_zeus";
+          "Rode Kruis-Gent (internet)".pskRaw = "ext:psk_rkg";
+          "DasNetwerk".pskRaw = "ext:psk_dasnetwerk";
         };
       };
     };
@@ -70,6 +70,7 @@
 
     age.secrets."passwords/networks.age" = {
       file = ../../../../secrets/passwords/networks.age;
+      group = "network";
     };
   };
 }
diff --git a/secrets/passwords/networks.age b/secrets/passwords/networks.age
index 01c4d8fddf54cae2045d5712687ecbecfe97f25f..6203e4aedfe8a9897f13349a028454f2fa326f9d 100644
GIT binary patch
delta 681
zcmZ3^dY5&APJL8hP*Q|pN}z|QNu^nOm_>TNc1d=XXMw9vc$#adafq9tOP))qzmH+A
z30J7AMR}Hcluu${l4ovMU}1W`kzrm$wn1q{ett+*ftgQImTO{QxVNK8D3`9CLUD11
zZfc5=si~o*La}90l0~{gR7qipzfXlnMzE_<v7wVunOl0eS!A(sNk&0Qh?iq|PHIJ(
zTWFznRc=KwmwTSMcCxdnqnn9=W1dHrYqGCvRX|=@sabMJuC{i1l&7(?V{W*9nR{ja
z#E;_jRj%Qtnc;zMQRaT--bF=erV&ZW0R?5w?p{fzP9@G|!QL+Jr2z&RW)-1arB2Ri
zA%Q*-UV)VcLE$Cl7A|Gl=H*o;h7nQ4B^l*`h56+nK@r}DhUJc2y1Kdw{yAQuWf{d~
zf$91FnIXlNmhPzq=1zWo<<1tS6>ct;jt1`a;bD<gX8FdET$}e*Zm(;uSbOZ>^5qWi
zdF#4U6KA~EnINeUGu?=ze{zPe*Z0JSIoi3Od_8BDet)o1J!jq(_cw=SCvAIYzP;bl
zSYq4B^u(N;^OdY(Z&n9<J+(cfZO+$^%OgXL<|esUGd;6wY&}pn|G(B<(Op^AYs{M5
z`@46Fsny@MYyOv9`Rjv1RL1!iy4(lrezHzG(KshK<8^@w8_$fi3&&Us{B*CIy1f7K
zE39EpzkQa=<D(WC42yM+M#k=LJGd_CNz>;3$oxm^!@E!CUfcILe8<vUoh{3cML8dE
zi0E|oPWzm#R`bN9WXd!R`3rAOK6w10Mj_XZ-G0XO;$8865zJOc%_~FSu9%ndSf9Pp
zXS3GE*wvcr^SqA91}<m18R>fP@>Tx>2WPq**k8v~bbY&oarNP=^Vs)&V4f?oR6wXh
e>hw?d*EUv0mwWA6<Ws6uSO2_wOzze;10ewCi5iOl

delta 627
zcmcc1x}0@_PJK|Bk(;Thsh4|xS!HUmlXgLAvSE0JiIZ8dfw5^og<(!kx~r?Bwvn-c
z0avn7Kt-m1l6#Ivv9phBsBds&ghgPfcVt<xxw~&@UYM~<L2zD#SCCPGE0?aFLUD11
zZfc5=si~o*La}90l0~|LyFq4Ea9Kd8TR=v+MNWBOnOl^BVN_JGS%!~?Uqnh-Vrr02
zwy9e{N{+Dsmyd_5QDLyNVPRQvWqE<Ncd&<PM6kKLdt^vOc5tLgRK7)UepHHkKt!SM
z#E;_j1sR1Vh2Ewm>FE}!Ri(~G&Q4WsL1FnB`q}<I{uVi*nVFuxKH=U~`k^LV-lmRu
z+7;QJ9wCK(Mcz@CnZ9O*S*1?ip+SL}>4j!_zNIOFo;hhw#mRwOy1KdwZa$XUe!l*0
zZf<6QDOKfu6&~g}`pH#Mm7z|hQJ$e0Db5!4<pw1_MK1d3Ty}apE^~e8J^5CC;miK`
z>!*DxeysZcf63OYzO1{fVefC9_WIbyalx2Bc#X*OGu5@e63fj~Jk5e{T133jyE?6<
z`$TDbfaqt2cMWxMu`jnQTOy<)eb%_i(6}Om@mbH!sZ9rN<foNM2d?vNvUgHwyg7B&
z<fknC#`X3bI`d7Ux1EfVkhkr8x;NmUyw2+$!w1SGTQ5c}SY<h9gV@rW$2VMTb~rXC
zS?`&^s*)X&il6(H=1E^!YPW0Jp$n7mI|ScK>0i4rxGJfB&JvTC2Qm(O-M*Ba9#gx`
z`^n$A%GQSjUR;|X^g5tC=TSuJ_gJ+T+Gp$&FKtO~GMQ$nuQa8l+brL+-9NN%>yvNR
a)k}VPeE1M1&GGi*^r_F?!``2{`vCxr9{{%i