From 2f22d666288407b4242c09e842fd3a4cacc32ac4 Mon Sep 17 00:00:00 2001
From: Alexander Heldt <me@alexanderheldt.se>
Date: Tue, 17 Sep 2024 21:17:42 +0200
Subject: [PATCH] backwards: Use `secretsFile` for `networking.wireless`

---
 hosts/backwards/modules/network/default.nix   |  19 +++++++++++++-----
 .../backwards/wireless-network-secrets.age    | Bin 0 -> 340 bytes
 secrets/backwards/wpa_supplicant.conf.age     | Bin 459 -> 0 bytes
 secrets/secrets.nix                           |   2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 secrets/backwards/wireless-network-secrets.age
 delete mode 100644 secrets/backwards/wpa_supplicant.conf.age

diff --git a/hosts/backwards/modules/network/default.nix b/hosts/backwards/modules/network/default.nix
index cbd9d05..619931a 100644
--- a/hosts/backwards/modules/network/default.nix
+++ b/hosts/backwards/modules/network/default.nix
@@ -1,10 +1,22 @@
+{ config, ... }:
 {
   networking = {
     hostName = "backwards";
 
     networkmanager.enable = false;
-    wireless.enable = true;
+
     #wireless.networks are defined in the secret `wpa_supplicant.conf`
+    wireless = {
+      enable = true;
+
+      secretsFile = config.age.secrets.wireless-network-secrets.path;
+
+      networks = {
+        "w1-f1_5G" = {
+          pskRaw = "ext:w1-f1_psk";
+        };
+      };
+    };
 
     defaultGateway = "192.168.50.1";
     nameservers = [ "1.1.1.1" ];
@@ -24,9 +36,6 @@
   };
 
   age.secrets = {
-    "wpa_supplicant.conf" = {
-      file = ../../../../secrets/backwards/wpa_supplicant.conf.age;
-      path = "/etc/wpa_supplicant.conf";
-    };
+    "wireless-network-secrets".file = ../../../../secrets/backwards/wireless-network-secrets.age;
   };
 }
diff --git a/secrets/backwards/wireless-network-secrets.age b/secrets/backwards/wireless-network-secrets.age
new file mode 100644
index 0000000000000000000000000000000000000000..5d131ae403c1251ec13fa5813b0ff1c7056cd1ba
GIT binary patch
literal 340
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+C^hg1Pgk(?HA*io
zGR!ebOV!R#3r)$dayKe-i!5^wbhj{1_O&Q5@Xs%D%d*T5iR3ED$S5+)$S8I9G6?tZ
zaY+rz3(GKyNb;*F@HF)@vP_AJ%nJ(+cMhy5aYVOGJKrzSBTykFFwNB2BG@g;%p)YH
z&@j}+*x4yJ*VMN-Ez&JbKgiYJ-76(OB+94IC6ueQI9ofyG~6)R#L_g+H8?Wd(lgUd
z-?$*8BCM#~+)zIw$j3j-+cm(&qL@opS63l9EIl$gKOopBGA!7+IM6-NvdqP=!Z<|V
z$g-la+}kZMqM}UO&9@-HyqIhGO_qyWJ^xo5PnX-o_;L34zu^*xmN#qfbn$39#@HqO
Yb=RjXtCHuOCn6#kb{&#zv|Ann0QmWIK>z>%

literal 0
HcmV?d00001

diff --git a/secrets/backwards/wpa_supplicant.conf.age b/secrets/backwards/wpa_supplicant.conf.age
deleted file mode 100644
index 7ae2fe4e46fef663faff480f3a441ff44a26e7b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 459
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+C^hg1Pgh7TsY=a=
z%rbRK^bhtA@h~VVO{%O6&I!*<E6Gbq^YqR%a!fHU%`f(Mw%{_iaP$cC$hI&k%nh-q
zFi$PZ$qX(|^l=TV($25U_H)jvsz?p9Fc0-8Do3|XJKrzSBT&K9&o9a)FswYk%py0p
zGTf!iE7ig&soc{z#M#%qAUN1PvM{|O#nd&$sGKV;C?d$v*U{HW-=!kMFU8Hz#mls+
zIK#l(DcP~4B+94MJKQiT$~oO6B$7*4S63k^z%xBD%h$Cq*TS>ZIn&A9)hH_}rQFyc
z%-qF2(%CW0Gp)$jHQOY>#E~m*oB6W8o2QFDiQ)dzWd1<u-oZ56jr$aq2DFx>rduvQ
zbnr^CNxH#`x8H7`IU00$LH6Z_(DSdawa5j1TRda_iCwJ|ZX93u?ebGS_j9Me9J`jr
zFv*CeM3A*ScenDRE>oRm8Htn0a>26oI~HkkM?2O|nICg%tNr)9KDR&N);~fr_J^#l
ucD~K5-s`{TPEP;N!q0xI3sp8b@FqP}*NEF18v1U9*lhRfXSC;-%mx6!2ed!{

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 0923d5b..b6fd1aa 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -38,7 +38,7 @@ in {
   "backwards/alex.backwards-codeberg.org.pub.age".publicKeys = [ backwards alex ];
   "backwards/alex.backwards-git.ppp.pm.age".publicKeys = [ backwards alex ];
   "backwards/alex.backwards-git.ppp.pm.pub.age".publicKeys = [ backwards alex ];
-  "backwards/wpa_supplicant.conf.age".publicKeys = [ backwards alex ];
+  "backwards/wireless-network-secrets.age".publicKeys = [ backwards alex ];
 
   "tadpole/root.tadpole.age".publicKeys = [ tadpole alex ];
   "tadpole/root.tadpole.pub.age".publicKeys = [ tadpole alex ];