From 9273a8d624a60af600434203fb56463738f30818 Mon Sep 17 00:00:00 2001
From: Konrad Malik <konrad.malik@gmail.com>
Date: Sat, 21 Sep 2024 14:52:17 +0200
Subject: [PATCH] fix: wireless now requires secretsFile and pskRaw

---
 hosts/common/options/wireless.nix | 14 +++++++-------
 hosts/common/secrets.yaml         |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/hosts/common/options/wireless.nix b/hosts/common/options/wireless.nix
index 28f09aec..5063d3a1 100644
--- a/hosts/common/options/wireless.nix
+++ b/hosts/common/options/wireless.nix
@@ -22,20 +22,20 @@ in
       "1.0.0.1"
     ];
 
-    sops.secrets."wireless.env" = {
+    sops.secrets."wireless.conf" = {
       mode = "0644";
     };
 
     networking.wireless = {
       enable = true;
       # Declarative
-      environmentFile = config.sops.secrets."wireless.env".path;
+      secretsFile = config.sops.secrets."wireless.conf".path;
       networks = {
-        "UPC7335283".psk = "@PSK_UPC7335283@";
-        "UPC8795410".psk = "@PSK_UPC8795410@";
-        "MALIK_E_DOM".psk = "@PSK_MALIK_E_DOM";
-        "TP-LINK_FD1F".psk = "@PSK_TP_LINK_FD1F";
-        "Konrad's iPhone".psk = "@PSK_KONRADS_IPHONE";
+        "UPC7335283".pskRaw = "ext:psk_UPC7335283";
+        "UPC8795410".pskRaw = "ext:psk_UPC8795410";
+        "MALIK_E_DOM".pskRaw = "ext:psk_MALIK_E_DOM";
+        "TP-LINK_FD1F".pskRaw = "ext:psk_TP_LINK_FD1F";
+        "Konrad's iPhone".pskRaw = "ext:psk_KONRADS_IPHONE";
       };
       # Imperative
       allowAuxiliaryImperativeNetworks = true;
diff --git a/hosts/common/secrets.yaml b/hosts/common/secrets.yaml
index 0bc40fc8..4043b31a 100644
--- a/hosts/common/secrets.yaml
+++ b/hosts/common/secrets.yaml
@@ -1,4 +1,4 @@
-wireless.env: ENC[AES256_GCM,data:5cGEaF29w6UGXWTaEdHobL/CFC5dLuCyp+HTlXGlyT3BODNjI/8agKxhdjUGybEBS0jG7K55qPxhkTyTvQLN2E4gkS+QKMRxU1Ay64ZL0moNNIH9JyUOEgb5fY6Zzba7mzKeQ2ScX1nNLSfLGAxuLmTHwvtNENnzPWKiIxkb7pkMZKJqM9Lh28ANg4Sv6diGv3ffEw==,iv:cXvQDfUW9KkWPpDitmBadKvQDYOcna0L6YUXU+CsWSM=,tag:bU3UIorSYI1DYSOzE6rUYA==,type:str]
+wireless.conf: ENC[AES256_GCM,data:3OTFobVG85nRRuvxhJxyhqGAJRfDFfCwYI850BPvgBlakIWXlwIFq3JSzI8czYkbFMOk+g68jMrIv6XJYDEi/M5nOJyL89tjXFnNBpi1TiCm21JnRsItB8/I2GEj4mJszWVhau0DF0V8VC2J5cMOx9KHmTtNT8cNvznvSSnwZ10zruSnytBij03BrHOCKSt7SmxAug==,iv:4OjI6akv0WN3KN+pVJOCAOL+y9/k716ZZhLkJnvNoDg=,tag:9eAvDeCoETEU5qPXmqg/TA==,type:str]
 #ENC[AES256_GCM,data:WcUK1k5O+TjuA0suEbd0DFzUh61rs5I=,iv:2901qgd8yIUolEY6LzlRo4W5wIJeXjSF8Gsz02/Dqu8=,tag:BsWfaKE6yV2YcHpvGnU0mA==,type:comment]
 tailscale-auth-key: ENC[AES256_GCM,data:vrCcfsT2ezv9pMPQno8pzZRDBwwPMglR35UEMbiT00ZAGGryAeq9yIZ3IfKbyWf13MxNAvZU2TZ4,iv:gDrnh12HmYptzAaUBedHD7yzzxJapZVitFY1qNYc6nQ=,tag:/0CdPitAm4+wGl6VbwMLoQ==,type:str]
 sops:
@@ -79,8 +79,8 @@ sops:
             S01xMm1OeGg1UXVZR1dsQWJ4SjhKTzQKY5X7RoiA594SeN7dlqfor2bKdtZOZ7vj
             8qEr9y89UYr34eoKxwtgQNRMH0fW9UeGY3639Itn8B+ICoDFYtDZGw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-05-14T14:42:28Z"
-    mac: ENC[AES256_GCM,data:s+KoVXrbU4CrQ91fQOnU8zIkdULEfyrJn6ZsN5gcC8cxIc+/F+MeZk15WxXm8iGb/IphYu+v7OkdCP4QNprPHJWYsfMoLcgKDyVJz7BwClE+yWNxaLL3dJdElpWOMoMKoYza7OPT/iZpRX9zRQl2cicwqv7h3yn/YFfA4uWuHg0=,iv:iF1TYilzY56wx0fHkiHI8D1CAOE73J1sVN11kO/6F5c=,tag:wSw+gFPxOm7YZFAdwBiJXw==,type:str]
+    lastmodified: "2024-09-21T12:52:56Z"
+    mac: ENC[AES256_GCM,data:Zlg3sO+9EZrKPpBrUOjaqDhVXx5xRaT09q66e5QEy6HlNS3rJWbqNXoNp1p83ZnU/N3z/PsyHaHcVrQdpttDD3PiSsjLRxIZo6TKyiWbmp/bm+ghGtKS+UJOrczrP4qn32n1gZuTowcwWWoCv3vTHPkJApBTWCp8Tqh7q4ZIX7c=,iv:K992XsZ//8k425mQhbQwRMAqdrybcKVlHXcZUlcpyTI=,tag:uWMuc1pFOI2SC3GxqKFt6Q==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.7.3
+    version: 3.9.0