From 59328370757f0175c497e2618aef613cf4f40c1d Mon Sep 17 00:00:00 2001
From: Ari Gato <ari@is-a.cat>
Date: Wed, 18 Sep 2024 12:07:30 +0200
Subject: [PATCH] n/*: wpa_supplicant added a mechanism for handling secrets

---
 nixos/akamanto/default.nix    |  6 +++---
 nixos/kamaitachi/default.nix  | 10 +++++-----
 nixos/tsukumogami/default.nix |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/akamanto/default.nix b/nixos/akamanto/default.nix
index 261ddf7..c7d1ab8 100644
--- a/nixos/akamanto/default.nix
+++ b/nixos/akamanto/default.nix
@@ -148,9 +148,9 @@ in {
     useDHCP = true;
     wireless = {
       enable = true;
-      environmentFile = "/etc/wifi-secrets";
-      networks."hackerspace.pl-guests".psk = "@HSWAW_WIFI@";
-      networks."hackerspace.pl-guests-5G".psk = "@HSWAW_WIFI@";
+      secretsFile = "/etc/wifi-secrets";
+      networks."hackerspace.pl-guests".pskRaw = "ext:HSWAW_WIFI";
+      networks."hackerspace.pl-guests-5G".pskRaw = "ext:HSWAW_WIFI";
     };
   };
   networking.firewall.enable = false;
diff --git a/nixos/kamaitachi/default.nix b/nixos/kamaitachi/default.nix
index a0c20e1..53f2c9a 100644
--- a/nixos/kamaitachi/default.nix
+++ b/nixos/kamaitachi/default.nix
@@ -116,11 +116,11 @@ in {
     useDHCP = true;
     wireless = {
       enable = true;
-      environmentFile = "/etc/wifi-secrets";
-      networks."hackerspace.pl-guests".psk = "@HSWAW_WIFI@";
-      networks."hackerspace.pl-guests-5G".psk = "@HSWAW_WIFI@";
-      networks."Nibylandia-5G".psk = "@NIBYLANDIA_WIFI@";
-      networks."Nibylandia".psk = "@NIBYLANDIA_WIFI@";
+      secretsFile = "/etc/wifi-secrets";
+      networks."hackerspace.pl-guests".pskRaw = "ext:HSWAW_WIFI";
+      networks."hackerspace.pl-guests-5G".pskRaw = "ext:HSWAW_WIFI";
+      networks."Nibylandia-5G".pskRaw = "ext:NIBYLANDIA_WIFI";
+      networks."Nibylandia".pskRaw = "ext:NIBYLANDIA_WIFI";
     };
   };
   networking.firewall.enable = false;
diff --git a/nixos/tsukumogami/default.nix b/nixos/tsukumogami/default.nix
index d6c358b..51220e6 100644
--- a/nixos/tsukumogami/default.nix
+++ b/nixos/tsukumogami/default.nix
@@ -115,9 +115,9 @@ in {
     useDHCP = true;
     wireless = {
       enable = true;
-      environmentFile = "/etc/wifi-secrets";
-      networks."hackerspace.pl-guests".psk = "@HSWAW_WIFI@";
-      networks."hackerspace.pl-guests-5G".psk = "@HSWAW_WIFI@";
+      secretsFile = "/etc/wifi-secrets";
+      networks."hackerspace.pl-guests".pskRaw = "ext:HSWAW_WIFI";
+      networks."hackerspace.pl-guests-5G".pskRaw = "ext:HSWAW_WIFI";
     };
   };
   networking.firewall.enable = false;