From 34902172ee2b4f97ae343f1e41802adbadd5e013 Mon Sep 17 00:00:00 2001
From: Ethan Simmons <eesimmons9105@gmail.com>
Date: Fri, 2 Aug 2024 13:36:20 -0500
Subject: [PATCH] Remove unused secrets and update ankaa

---
 .sops.yaml                  |  3 ++-
 flake.lock                  | 36 ++++++++++++++++++------------------
 secrets/diphda/secrets.yaml |  7 ++-----
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/.sops.yaml b/.sops.yaml
index 24c0639..90571bd 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -9,13 +9,14 @@ creation_rules:
       - *admin_ankaa
       - *admin_alpheratz
   - path_regex: secrets/ankaa/[^/]+\.yaml$
+    kye_groups:
     - age:
       - *admin_ankaa
   - path_regex: secrets/alpheratz/[^/]+\.yaml$
     key_groups:
     - age:
       - *admin_alpheratz
-  - path_regex: secrets/diphda/[^/]+\.yaml$
+  - path_regex: secrets/diphda/[^/]+\.(yaml|keytab)$
     key_groups:
     - age:
       - *admin_ankaa
diff --git a/flake.lock b/flake.lock
index 86697c7..b8b5df8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721534365,
-        "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
+        "lastModified": 1722462338,
+        "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
+        "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1721569510,
-        "narHash": "sha256-NOJlbyWDiAKL71BsCWRu3GUQN/BJtz2PBwT6q8tkFDA=",
+        "lastModified": 1722588653,
+        "narHash": "sha256-ecdFExRGQchpYG2T4A53GCcCJ+2xIEklcYGIBhpuI+s=",
         "owner": "ggerganov",
         "repo": "llama.cpp",
-        "rev": "45f2c19cc57286eead7b232ce8028273a817aa4d",
+        "rev": "e09a800f9a9b19c73aa78e03b4c4be8ed988f3e6",
         "type": "github"
       },
       "original": {
@@ -98,11 +98,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1721379653,
-        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
+        "lastModified": 1722062969,
+        "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
+        "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1721409541,
-        "narHash": "sha256-b6PLr0Ty7JPDBtJtjnYzlBf02bbH9alWMAgispMkTwk=",
+        "lastModified": 1722372011,
+        "narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0c53b6b8c2a3e46c68e04417e247bba660689c9d",
+        "rev": "cf05eeada35e122770c5c14add958790fcfcbef5",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1721379653,
-        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
+        "lastModified": 1722421184,
+        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
+        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
         "type": "github"
       },
       "original": {
@@ -205,11 +205,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1721531171,
-        "narHash": "sha256-AsvPw7T0tBLb53xZGcUC3YPqlIpdxoSx56u8vPCr6gU=",
+        "lastModified": 1722114803,
+        "narHash": "sha256-s6YhI8UHwQvO4cIFLwl1wZ1eS5Cuuw7ld2VzUchdFP0=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "909e8cfb60d83321d85c8d17209d733658a21c95",
+        "rev": "eb34eb588132d653e4c4925d862f1e5a227cc2ab",
         "type": "github"
       },
       "original": {
diff --git a/secrets/diphda/secrets.yaml b/secrets/diphda/secrets.yaml
index 6f6cc66..42b30ab 100644
--- a/secrets/diphda/secrets.yaml
+++ b/secrets/diphda/secrets.yaml
@@ -1,8 +1,5 @@
 mc-arcadia:
     repo_password: ENC[AES256_GCM,data:SPP/RmwxAeeyERrMjO7vEqMd/SY=,iv:/U4sbPogBeqJ4vli2MmMb4H4BjMPFO+Fe/uRtyltvsM=,tag:i06a7yIDmhYJt3ARfDaE4w==,type:str]
-porkbun:
-    secret_key: ENC[AES256_GCM,data:+EvknWA8LcKeeL2vKY5G359MDhCGbyQ+SHgnhfuePEEDaZFPD/OpHCG14kzO/ZRfbTIeNfhGToUosozyXTW9lJCA5o4=,iv:Yd03TDi7QsdPjJAG3nTd9mMM8M0Jt4gpWQ2U0qxSGWY=,tag:j43I4hp3Vvvf9fD5AmRM6Q==,type:str]
-    api_key: ENC[AES256_GCM,data:SwrHPm9XjCDcfgXhX4WYysV3AH1lv06a3ziBPvUC0Q92oLTyqRyLVm//23i5XtB4U0HXE5ekxpk4DE1gJv5QpreXXk0=,iv:0MltZnFMNdhTmcR8mWSUMzn4iVoFKCy2GMF+Q14E1ss=,tag:5DzHE++Sxum8q4s2FgLTnw==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -36,8 +33,8 @@ sops:
             eUxTaTJVRlpNNWZodE8yZXpWTlpCWVkKHtJFmHUSNfy46J1BJdOvIRjegQrTWdfH
             KSbKbz7ezBOOPlrR7eDEx2FIjP4TVBRksYq+NYockmKVk+VGsc5pBQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-08-02T17:29:28Z"
-    mac: ENC[AES256_GCM,data:lncSSPR9F6+J74q2RBQJKRA4LsTzV+fM4DjVlvi3q82WfwhRpvguede6scAPK6MrGMFxks+rjiF0NA18ad9Pr7RDc3dL7Vt/L36eiVR0sknpFN5Kn0Ai31ylOwa08sTMHynxPQ/CRllTOYkZJ2jtDp+FWYQdZP5LtqB0p+1cwEw=,iv:FvZm1nMumd83BdMYo/26vT6DYACaO1B0cgDA/6YuBlk=,tag:Wt251XPhJLVYn0KGunBfBA==,type:str]
+    lastmodified: "2024-08-02T18:35:30Z"
+    mac: ENC[AES256_GCM,data:yNS6J50iZKBNl2Kp8V39bqObBtP92aQsmYWS+0+6tkdNlhcAgCHFFHsaCyMhm/IQOXKIyQnWlv+0HSLX1pajL6W7IVq6VF42iOSFtengNVafOaKU9g6rSzywsC49aCB8qn3yBOqnzMRxj600gxZgJwOztMpZloI6qIRzM1rZrKE=,iv:Y9EeHdBMahDKTm+pXvkZKyYfKD7XOh5exR5nRl5e3n8=,tag:d3ZOb0fkCNpxSma3MCJP0Q==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0