From 878118cbe8c5014a66fcffce71fab9803f1993a8 Mon Sep 17 00:00:00 2001
From: Roy Dumblauskas <roydumblauskas@gmail.com>
Date: Sat, 23 Aug 2025 00:24:18 -0500
Subject: [PATCH] secrets

---
 .sops.yaml              |  4 +---
 configuration.nix       | 19 -------------------
 secrets/networking.yaml | 27 +++++++++------------------
 secrets/roy.json        | 19 -------------------
 4 files changed, 10 insertions(+), 59 deletions(-)
 delete mode 100644 secrets/roy.json

diff --git a/.sops.yaml b/.sops.yaml
index 4e98bf2..3af5f98 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -1,9 +1,7 @@
 keys:
-  - &user_roy age13ldedhh6ymava0d5dn54860a3f799gufknre9lfegegjt9ytes2qq5qgmr
-  - &system age1h672rl8yp4utgqx0ndxv2wtg5fw69vznyxa2p699rq4ku6x2afrslt7x2u
+  - &user_roy age1zad0qu648dhjav4pzjhkc6vswnqtacuv9230xcgle8wmv56r8ykqn0ud7y
 creation_rules:
   - path_regex: secrets/[^/]+\.(yaml|json|env|ini)$
     key_groups:
     - age:
       - *user_roy
-      - *system
diff --git a/configuration.nix b/configuration.nix
index 5181b68..e8c4bb2 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -42,10 +42,6 @@
 
     # test secrets
     secrets = {
-      "testKey" = {
-        sopsFile = ./secrets/roy.json;
-        key = "testKey";
-      };
       "networkPasswords" = {
         sopsFile = ./secrets/networking.yaml;
         key = "networkPasswords";
@@ -65,27 +61,12 @@
       enable = true;
       secretsFile = config.sops.secrets."networkPasswords".path;
       networks = {
-        "flooper" = {
-          pskRaw = "ext:flooperPsk";
-        };
         "NU-Guest" = {
           priority = -1;
         };
-        "d fam google" = {
-          pskRaw = "ext:ancestralGrounds";
-        };
         "mojo dojo casa house" = {
           pskRaw = "ext:homeNetwork";
         };
-        "TwoHeartedQueen Guest" = {
-          pskRaw = "ext:2QCafe";
-        };
-        "Close Personal Friends of Osmium" = {
-          pskRaw = "ext:osmium";
-        };
-        "Pedestrian" = {
-          pskRaw = "ext:pedestrian";
-        };
       };
     };
 
diff --git a/secrets/networking.yaml b/secrets/networking.yaml
index 3a322c3..b0d9d64 100644
--- a/secrets/networking.yaml
+++ b/secrets/networking.yaml
@@ -1,25 +1,16 @@
-networkPasswords: ENC[AES256_GCM,data:EfeciBOb2oh7TBGx9lVhZeZOEtlJ55pdMN7HvovdEo7JEwRuep+DQou+qvU3PjTM2CCZBdVcNtBz3eouJGJTnjmZUvmUEQsr9ettCC9Jd6/YohqSl1r9ddd5djjmJwwwOnrCCLDR+a8yIzn5978Q4K2qFK0jQgmaATIIXFaNtQxp4zi6bPyY1wnYtDzQ4j4gXlbRO3TSPhU=,iv:/p7+dX05CRQtYuiRWuAMmTIhvxeBdahAJ+HWDX68p5k=,tag:dNQmeWSScJzQUiDfm0k7gA==,type:str]
+networkPasswords: ENC[AES256_GCM,data:qpLIDo32ZRQNlRogzH/fjVyzUC+xnLKYqBjwactCQOI=,iv:+z5OUtf7mrnF57KzjWZhFVerFyT8qQMw9OubKx2C9Gw=,tag:1a7B9wlcG8EV2DxaLrm3Gg==,type:str]
 sops:
     age:
-        - recipient: age13ldedhh6ymava0d5dn54860a3f799gufknre9lfegegjt9ytes2qq5qgmr
+        - recipient: age1zad0qu648dhjav4pzjhkc6vswnqtacuv9230xcgle8wmv56r8ykqn0ud7y
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEQUdXSCsrdyt5d3BTUnI1
-            Mml0UlNvYTMySHhWcXdrZkRBZXUxSGxpZFE4ClNMWFNST0tNSlZ6Z3FJM0NkS2RQ
-            NXpTQ3NzQThCbmVOcVBmZTRjaERzcEEKLS0tIEFDbkxSOUMyWHJFd0Rxa3k5Sm5K
-            K2dyRTh6TTlHNUhSM2x5U0pWVjZSUVEKUetKBgQi9p5rYMIylJVWzwBEYVgMM3vj
-            PRtwj34hzVKjt/GBrJj1cpl2VxrQ9K8ZOGx6sC7daW2NOO8OpkbIyQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRNmpTdmdaK1JMRUJyNmNq
+            Vk53Q3pka2FvTG9TeFVENjd3aVBrVitEdDEwCmV3Y0gzVW9pQk9ZS05vVWwyUUF0
+            WlhGSnpCejMrVFluV21aUnFodkZKc2MKLS0tIEZHaG01OEFKdnhwZXRNc0hZOExw
+            SGhaSm45OHFpbWk3SGtLcWsrN0lZbUkKfE3rFzjg+53NZc9ly/fzGhLR928LO/bu
+            JQJxUWE5T6mdsrI0pH7eWouXgRHpBF9TCXAzeLabj8W6E7eY3ky8Bw==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1h672rl8yp4utgqx0ndxv2wtg5fw69vznyxa2p699rq4ku6x2afrslt7x2u
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXMGdDdjBTSjlhd0loNjFj
-            SUZnWjJvRkZQUzZObjNFWDZmU0RWN3RjcWdzCnAzSTA0cWxnZVcvVTZXL2xrVDNX
-            bjVzV0FWV0U4WHE0RmllS293blVCdk0KLS0tIEgvc2ZtTE5nQTYzSVVUeEkxR3NI
-            RjkzM1VZenF5UnZYMHhISDBRT21QUjAKUZAqk4ZRVelUQYCenw7nzVFL1/59LowL
-            60SyiYAnm+pxAyAJW6merHY+rJ7tZZhyZEi9ZV7KvOepQA9MFXjBmQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-07-08T14:51:21Z"
-    mac: ENC[AES256_GCM,data:N+evRz5VGv4kQaEML+rMUGk+JB2fDoS8EeuYeRqhrSeHzWcuvjCC+YhuINPHH0umGm4XoM/NWe9NX2wB1LXlgNi/gir9mNmH4u8l+qnvHj4Ke6JForbbB7GIB2eQTlI3aWcYaZTyhmF/N6XNUPeQaN+ivEml0ZoVUs856MYyWp8=,iv:qFCyfKtNClggWgq6Jnrzpj2PsBZQZosuBC7+C9B8g9U=,tag:MYwywPKb2ThP6a3I+ig2DQ==,type:str]
+    lastmodified: "2025-08-23T05:23:41Z"
+    mac: ENC[AES256_GCM,data:1b6NtLVUXj+mf86hsHrgfzuaoM3EuYVbKOyK6BFOusWSEkFLJGXYOZ0Lew4xm4R0R2KZP59x4R60Ag540zemwPOBE0tyrLZhcdt3u64Vym/XCUDqVHLPO/fAOEyfu/Mi5+IJxktSdz1nva938f8QvzJkeITkuE4R44coh6Ph/vQ=,iv:wxrX1f47vtqWXxDyHdFIxFIwcrcLzetj5ouZ0BkF8UU=,tag:HM4/w4t7be6Xa5awrXvJhA==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.10.2
diff --git a/secrets/roy.json b/secrets/roy.json
deleted file mode 100644
index ca0f093..0000000
--- a/secrets/roy.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"testKey": "ENC[AES256_GCM,data:ajwGOMBfWMpnZxY=,iv:dEH/rvFRPjz11s9dxMUZ7+8PRgGEHdCHgd8f3mTct8w=,tag:ttLv52lYX/zmjNe/e9Ijww==,type:str]",
-	"sops": {
-		"age": [
-			{
-				"recipient": "age13ldedhh6ymava0d5dn54860a3f799gufknre9lfegegjt9ytes2qq5qgmr",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2a2xJSjYrck5TcjR2d2lB\nYVR1dVZFN0EvUVo0SC9hMTZ3K2wrVHFOYW5JCkduQ2VWNXJVMmtqNGU5MThWWUt6\nZDM4Q0ZvaThXaFBMazlLb25qNzFINjQKLS0tIEpFbURNVXpsSGM3ZmZ1ZndDSzBV\nb0wxWmxYNVBwcHRIRVkzU3Y3d2Jyc0EK7AcQ6lG7Uz4tSs+M7luPXJ0VsCEnWg3w\nmOVmMEq2MU/Tc9otredFBQjxc3ax+0RBGRqvsY4N0Ijn2UGd6q5tiA==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
-			{
-				"recipient": "age1h672rl8yp4utgqx0ndxv2wtg5fw69vznyxa2p699rq4ku6x2afrslt7x2u",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0L1V5bndJYjZWOFhBc2tB\nY1oyU3pGUWttNG4zVi9WY01OdjdNZnB6MGlBClBxcGFjejBlTUY3VXpTRC82aENJ\nM2RaWVd5ZkliOHBNb3IyUDQwZzVRZVUKLS0tIFZrOE1VMkhKR2ZFWHBUdW9iblZS\nNFdlcXM3Qmw4L0djK3NKaEhkM1FaZ1kKQ1+8rkbH6vvoSIwMWwt7xoPKO8wM2VrW\nQxmFJ5bJBwALzXtMGI3Erhh4hgPMEc2cqvDWawIm4nNLq5ketK1/Wg==\n-----END AGE ENCRYPTED FILE-----\n"
-			}
-		],
-		"lastmodified": "2025-06-10T15:34:46Z",
-		"mac": "ENC[AES256_GCM,data:8l/XINJNCEX2aTXhFTOpS4BpBRYNAhqQdJMBixj9XNNKLZ9mGTkLMRTuJELfW1bxHcChCln3kmhdAzcU3ZWRCjKfyFj9H/AnmPIhbVu8BbGIEffTqcxUn0m+W8SsMfRkHtWA/mK2gBjg8oczBcEAfW3IVB5JAPwjfa2Q6EOQO+E=,iv:3hFOEyyReYHZv0uQ5sqaGkjcuIWQpOx48zm/AyBG1Us=,tag:TIIfwqjJuaYXkpYKw2NIMA==,type:str]",
-		"unencrypted_suffix": "_unencrypted",
-		"version": "3.10.2"
-	}
-}