From ac9c1046424c87168d230061194320be40a0ecc4 Mon Sep 17 00:00:00 2001
From: Roy Dumblauskas <roydumblauskas@gmail.com>
Date: Tue, 10 Jun 2025 11:59:08 -0500
Subject: [PATCH] change to networking json

---
 configuration.nix       |  6 +++---
 secrets/networking.json | 19 +++++++++++++++++++
 secrets/networking.yaml | 25 -------------------------
 3 files changed, 22 insertions(+), 28 deletions(-)
 create mode 100644 secrets/networking.json
 delete mode 100644 secrets/networking.yaml

diff --git a/configuration.nix b/configuration.nix
index 17673a3..016fe96 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -61,10 +61,10 @@
 
   networking.wireless = {
     enable = true;
-    environmentFile = config.sops.secrets."homeNetwork".path;
+    secretsFile = config.sops.secrets."homeNetwork".path;
     networks = {
-      "@homeSSID@" = {
-        psk = "@homePsk@";
+      "flooper" = {
+        psk = "ext:homePsk";
       };
       "NU-Guest" = {
         priority = -1;
diff --git a/secrets/networking.json b/secrets/networking.json
new file mode 100644
index 0000000..09957ce
--- /dev/null
+++ b/secrets/networking.json
@@ -0,0 +1,19 @@
+{
+	"flooperPsk": "ENC[AES256_GCM,data:yDqMy/9lhDBeefDG7RPuQged,iv:rLPYQB1yBn36GBGCswGUn+8Umq5n9V4FNIbDxLpNj+Q=,tag:w69jVPWauUrKHDDHqVKgCg==,type:str]",
+	"sops": {
+		"age": [
+			{
+				"recipient": "age13ldedhh6ymava0d5dn54860a3f799gufknre9lfegegjt9ytes2qq5qgmr",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1bnAwSnpobkdVdHRzQ3Fh\nZXpHUVRSUlpSR3Zlb3BnRmlkUVRTZWVPcVU0CjMwLzRreG5qRkFtQ3JQM1AzYURO\ndXI3bThvU2ZVNXBhdUgxaDh3NlkrRjgKLS0tIFExN1NhZU5qNlRHK29RTkJxcFNz\nN3Mya1FYLzd5UEFudTUwNFJxWGtEY0UKjCUVqxHx7KTypLuwUTm7/AAJYP+LFfHR\ni3wq3Q1k5CzM0E+4rA4MXXgly2r19few5FbUlR++qLrKBnKawJcJoQ==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1c94x3h0jj3x7zvd9rxxed7nqlckzwyttgagznzzfp3dwynpuj92snqaljm",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqS1Fnc0RNYXp5TnhNeUdn\naEV1MXNHKzVSVWxXeHZiME90L0VIbWJZK2lRCmQ0TVZzUmNEMGV0UjdyckxKQ3Bi\nbmhOWE1TR3dWdzJRR0dJbndpRTB2UkEKLS0tIGlZcTFFdUo1YW9QSER2R1RrOWE0\ndSs4bGtQZDdLaitPeVJIcTF2NWF3Z0EKDgWDcP4JBrx6CKKNfM/qZ91TJCC8Ydk3\nje3ybKAYNn0Z3CysZd6L/PvNQfr1RqPZ08dwrZJsjqQWey2NX3u7Zg==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2025-06-10T16:58:36Z",
+		"mac": "ENC[AES256_GCM,data:yjnadqNLguEGOg+lsJcDkhc7jF0X6Pjl7U/CRzu4hxhfdPaseo5hlRhQN7wInfU6Ai1Md+tQK14XEXWOlMbERaaIc3hA8Ni0vEc+ooTKkGdcLzYA+Onr5VJ9MIbd3sOfLZRlIFpVjbbih1tUy6G0wYMN9IM7Kd8i0NyxI+m3PFE=,iv:F1CBf0FSSS6pyt5bN+ELTYA3JecNbPSmCt4ViWaX4bs=,tag:FUMHDJlIitvvnKUqfPg4YA==,type:str]",
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.10.2"
+	}
+}
diff --git a/secrets/networking.yaml b/secrets/networking.yaml
deleted file mode 100644
index cdf03aa..0000000
--- a/secrets/networking.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-homeNetwork: ENC[AES256_GCM,data:ra7npifMGpqfLpSor1/nEEalyAVLc16PmLCbHFuyyp7PCfAsvJE6AU8fHq0=,iv:SdwCUU+uG/akmoW9ptr1IEGdxkKC56eFD6TY81HrUOI=,tag:tbs9N9OsYigIU5CCW/Q4AA==,type:str]
-sops:
-    age:
-        - recipient: age13ldedhh6ymava0d5dn54860a3f799gufknre9lfegegjt9ytes2qq5qgmr
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaU0orRE9IeWszTitSQjdG
-            dlNwNEpzWkxjYURzVEU4U2tVdjhGdDJqNWhBCkFyclRRcU5UcFVRTVlDUGphVk51
-            U1lkbHdxZDY3R0NXMi9jdVZBSkhORWsKLS0tIEJqNk5uYzAycmJ2R3p1Q3M4alJo
-            OXFaeVhQUXBiVlpXWmtTc2ltdTRRbjgKSfka7xy0IGyQZfjNJZMedczJcRB7CCp/
-            GI/KNZ8mg/WF822Tvey/zQ8Ix3X9/YLuFx85BSuEDqgChLDRRLwqKg==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age1c94x3h0jj3x7zvd9rxxed7nqlckzwyttgagznzzfp3dwynpuj92snqaljm
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6UkFnTG54THRTdG1DbHZm
-            dnNtQS9nbEwxNVB4eVloOVRqdThRSGlDaXgwCjlRTVgxT3drejlEK0RaZXQxK0VW
-            d3NPdjM2cFhvY1ZRQmRZTlAzdzFRRDQKLS0tIEMya1RrZnVRTlgwa0g4YUV3MkJu
-            Z2tIQVJzUk5JcVJ0c0YxWnUyRzhsY3MK9coZ1iRehK8JJao4b69bxAU8z+Ts7T3l
-            0P5r6195jkk0hilHxjAjrNf7aPR5IoFyj8Vw6hy/cJf7w7P8O9zHaA==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-06-10T16:46:54Z"
-    mac: ENC[AES256_GCM,data:NuJO0LEyl6j9S78FlXPA1f+jKw5NDuaD5fAqVWJQKwxqwrS05LGdKm3imyM/0Z4kJlFVUkD6Nt3DtD5OZl7bteslKm2wUEDFaSJkQubIf1k3FCGzGlNM3h1sWUYKU0Psa6Wa/pKYgzgHtaJGYOTVUHvux19aRE3mdy80oidGsc8=,iv:nNYTBs+IeUJtn6gSzUjIMnbQnayYRbL3XENyjvpGwfc=,tag:sLI6FBPBQqqkjoivc3tvug==,type:str]
-    unencrypted_suffix: _unencrypted
-    version: 3.10.2