From 17a58f1e7e07b52b076ded6a4bd83e2d03acc7e8 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Wed, 9 Apr 2025 00:40:58 +0200
Subject: [PATCH] Rename dtth-wg -> wg-dtth

---
 nki-home/configuration.nix | 16 ++++++++--------
 nki-home/secrets.yaml      | 17 ++++++-----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/nki-home/configuration.nix b/nki-home/configuration.nix
index a23df9b..9fe4547 100644
--- a/nki-home/configuration.nix
+++ b/nki-home/configuration.nix
@@ -84,29 +84,29 @@ in
       nki.services.edns.ipv6 = true;
       ## DTTH Wireguard
       #
-      sops.secrets."dtth-wg/private-key" = {
+      sops.secrets."wg-dtth/private-key" = {
         owner = "root";
         group = "systemd-network";
         mode = "0640";
       };
-      sops.secrets."dtth-wg/preshared-key" = {
+      sops.secrets."wg-dtth/preshared-key" = {
         owner = "root";
         group = "systemd-network";
         mode = "0640";
       };
-      systemd.network.netdevs."10-dtth-wg" = {
+      systemd.network.netdevs."10-wg-dtth" = {
         netdevConfig = {
           Kind = "wireguard";
-          Name = "dtth-wg";
+          Name = "wg-dtth";
           MTUBytes = "1280";
         };
         wireguardConfig = {
-          PrivateKeyFile = config.sops.secrets."dtth-wg/private-key".path;
+          PrivateKeyFile = config.sops.secrets."wg-dtth/private-key".path;
         };
         wireguardPeers = [
           {
             PublicKey = "+7iI4jwmM1Qr+/DKB1Hv8JgFkGu7lSV0PAoo+O5d3yQ=";
-            PresharedKeyFile = config.sops.secrets."dtth-wg/preshared-key".path;
+            PresharedKeyFile = config.sops.secrets."wg-dtth/preshared-key".path;
             AllowedIPs = [
               "100.64.0.0/10"
               "fd00::/106"
@@ -116,8 +116,8 @@ in
           }
         ];
       };
-      systemd.network.networks."dtth-wg" = {
-        matchConfig.Name = "dtth-wg";
+      systemd.network.networks."wg-dtth" = {
+        matchConfig.Name = "wg-dtth";
         address = [
           "100.73.146.80/32"
           "fd00::33:105b/128"
diff --git a/nki-home/secrets.yaml b/nki-home/secrets.yaml
index de69d63..03845ac 100644
--- a/nki-home/secrets.yaml
+++ b/nki-home/secrets.yaml
@@ -8,9 +8,9 @@ windscribe:
 scrobble:
     lastfm: ENC[AES256_GCM,data:+3G9zwmAu/B9omG0KUT0b5G+lJ4=,iv:ubrE4A35si9f6+m2sAino4SfOf9F4g2UjtF2Yy9n2e4=,tag:A/e6GECfIZuX2bVGPo9qyA==,type:str]
     listenbrainz: ENC[AES256_GCM,data:FNSJnYEQd+LgInmdyqcaAQG6imiJS/OPBEe2fBKQGKBjpCLy,iv:qhloVpcwcGwRDn6vOujgmvelbPl2korhELfyf5BvdjM=,tag:WnLaMUtHsxBaXNTAKwchkQ==,type:str]
-dtth-wg:
-    private-key: ENC[AES256_GCM,data:ySxPGzOplKwNLxRnPNw7If7xzxMwRkwTasT7FaQE9n5YB04R+gaQVjDqPqg=,iv:f5t94bUoo9sCGGwWytiuhg5jcKjzRjbR3Q0OIM28VDU=,tag:fJos9Hb9XytQbfGaPMa1/A==,type:str]
-    preshared-key: ENC[AES256_GCM,data:96q0ZfvPz4pb53XvTGameVkcETamYH8Xbv69672RBdacH6QjRCCVvPnBTfA=,iv:Q2Yonb07/Uu6KidhMgRX4zJuNU1ZySNC7g/5TwpMU80=,tag:1qQQdk20yIQlGZmX+/25RA==,type:str]
+wg-dtth:
+    private-key: ENC[AES256_GCM,data:a//pmovhmjh73YBHmae/91oVtWFmbiuh87gz6busqi7XcEZEn3KiYszuiMI=,iv:hLw5nqJDGDdiT9CfwDShXGRP6qoTWvfReq7qPs9x0n4=,tag:+b3cMjuVJTsz73wnlPW02Q==,type:str]
+    preshared-key: ENC[AES256_GCM,data:go9dm+FTEq7k0ec936ay1loTJZV8espqTFpGzqAQa9TzMnB1AD/JJHLMENQ=,iv:LjXD3ySLJVkerQH5J7ylSGATykTT6jEObuJc4vUnh28=,tag:qYO5r72tjothlT16Y8Ms0Q==,type:str]
 peertube:
     dtth-key: ENC[AES256_GCM,data:Gu7qOisVBZrFXKBr51165FJ7Ej4hV+lIf3AMC02R3UFNXOnTHF2xC8E=,iv:F83FuD1VjZEJFMcx3gkQuKCpJmYdHtO15fRHkYdMxJM=,tag:ScH42Tr5ZsIo9JMnXhylSw==,type:str]
 nix-cache:
@@ -18,10 +18,6 @@ nix-cache:
 nix-build-farm:
     private-key: ENC[AES256_GCM,data:m5neeWCEdaZ1MRhNwTptfDIgv3ABNlYyNil3oTD81Jbe/6WxWaS5Q++CRlHCjc2hOoHsWsZixw8iGZVTA+QXgH6B9C6A4oOAhgR9m92EGTEfFw0qxQbdzs7U98Yonx/N8SApUycZZB/EU81+MrDNY4GGzCiO6s00/vZLkDTYnqRFgbo+8KTG0BQTl4q+VYP2q3l0wy+Ivz5CWPmbz42Xdin/sBnjeFHKDuof4iZZnN3i8gUJ/mMw3lbdiHd6A8DL0G5Ut46ljzMC2aMsZOATCID3mPOPgI0xIetDofPJLDqVsNqptRHo8WB+KwDidvl222f5F7JqdSqgAMOJYPscrX0odufApiJfg5bbXBygvrDfAlPSruW7GsWGoKAhw0qC4NC/j+qYCwhS0qdorCLnIy3zzMtA6HkHtE675hy7/7oLj7k9Y8MhE4PxztjXTmDazaVCtKhnA/DpaxP2mH84gfCkJFD1YF9jtPm+P3e+46FwkW+WnHaA2L+H7Evava30DLEBhh5y9Gd1A3JN4isn,iv:7KUWg7+GWgmGJkbIvsy9gtccZBb+1Y5uDWhXQFk0obk=,tag:qJdM684XPHxecLVxVb5pgw==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
     age:
         - recipient: age1tt0peqg8zdfh74m5sdgwsczcqh036nhgmwvkqnvywll88uvmm9xs433rhm
           enc: |
@@ -50,8 +46,7 @@ sops:
             bUhIT0Z2b1dVWGNyS1hRVFRyZTA4d00KchP7EhSOMwBl5vFuuskzosRoi8jUu1sw
             hVjJNF2a40ewgkQgVAoWEzirHbknbQORzmepDDRth7Bve3UQU64+GA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-08-16T13:59:20Z"
-    mac: ENC[AES256_GCM,data:ncT8fbtEb9ZcLcftXwgAKJRPPSG4TRHFMArtVgWNmIjDRcCNNT7ICa+9Dl8DAYKRJ+8pgelV9StIg2f7rvypHYlckontEP5nwSFzEApLItG3AZXewTC8VPoDYb4T8/OWKDoa5kBMvGrDr1bFP/CZz7H8No+k5TV7fVExsw0PHpg=,iv:vxbkeJtHkOAq7NcaZEIOMV3qGEqBUg/vpJYumBBfY70=,tag:T0yw2x1O5Tp0UllLpcFryg==,type:str]
-    pgp: []
+    lastmodified: "2025-04-08T22:40:34Z"
+    mac: ENC[AES256_GCM,data:gjSk/mb+u53YmkvCv+ISIyxtH3FRVltAMkhnE4JDp61BG+Bhy+wGRYNi/W3OTGWIlyWQlAIgej8jPbWY8hXfOioB/VOLqpRJVSDLZ93zelJXCmNoJLaTW8xz7fWE9QUEYDeNpSlbDBotxBMSNriqtCPgtb6ze7qsWuws8OpxspU=,iv:n2pBBRoEsuJStBlD2dsYNP7DgukRJEf9FnuG39AwbjU=,tag:4Rg1oEjIU541Y9yBpAYssw==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.9.0
+    version: 3.10.1