remove gcp-instance-1

Signed-off-by: iosmanthus <[email protected]>

flake.nix

@@ -273,34 +273,6 @@
           ];
         };
 
-        gcp-instance-1 = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = {
-            inherit self;
-          };
-          modules = [
-            ./secrets/gcp-instance-1
-            ./secrets/cloud/cloudflare
-            ./secrets/cloud/grafana
-            ./secrets/cloud/sing-box
-
-            ./nixos/gcp-instance-1
-
-            sops-nix.nixosModules.sops
-
-            self.nixosModules.cloud.gce
-            self.nixosModules.cloud.sing-box
-            self.nixosModules.o11y
-
-            {
-              nixpkgs.overlays = [
-                self.overlays.default
-                self.overlays.unstable
-              ];
-            }
-          ];
-        };
-
         gcp-instance-2 = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = {

infra/gcp/main.tf

@@ -32,18 +32,6 @@ module "gcp_instance_0" {
   ip_revision   = "20240716232217"
 }
 
-module "gcp_instance_1" {
-  source = "./gce"
-
-  google_project            = var.google_project
-  google_service_account_id = google_service_account.main.id
-  vm_image                  = google_compute_image.nixos.self_link
-
-  google_region = "us-west1"
-  google_zone   = "us-west1-b"
-  ip_revision   = "20240726142448"
-}
-
 module "gcp_instance_2" {
   source = "./gce"
 

infra/gcp/outputs.tf

@@ -8,16 +8,6 @@ output "gcp_instance_0_external_address_v6" {
   sensitive = true
 }
 
-output "gcp_instance_1_external_address_v4" {
-  value     = module.gcp_instance_1.external_address_v4
-  sensitive = true
-}
-
-output "gcp_instance_1_external_address_v6" {
-  value     = module.gcp_instance_1.external_address_v6
-  sensitive = true
-}
-
 output "gcp_instance_2_external_address_v4" {
   value     = module.gcp_instance_2.external_address_v4
   sensitive = true

infra/gcp/terraform.tfvars.json

@@ -1,5 +1,5 @@
 {
-	"google_project": "ENC[AES256_GCM,data:zMkuJ/zlSOzCWZh4ej/hXLZDUTs=,iv:Pr7ULw2en+abQj3UXL+eTwgJZGGAXYrDgz5Ufi/91vU=,tag:Qt9zcNPLPl3rzEtEEPfVSg==,type:str]",
+	"google_project": "ENC[AES256_GCM,data:HVTilrjF36iBVG/ojbttzTZGWS8=,iv:uV6ERmnCvnvsQ5++oRgFhudO9hoKG2GwmrgiUA8OFuU=,tag:65NYp/Hxj+1wMwpYs0Lcog==,type:str]",
 	"sops": {
 		"kms": null,
 		"gcp_kms": null,
@@ -8,13 +8,13 @@
 		"age": [
 			{
 				"recipient": "age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBLdURHam9nQWFJenM0dUtM\neTAwMTJsdkRCcWd3WjRuYTB0dkxMYkJLRncwCmtwelByVTYybVdPYlo3WVdHOEFv\nRG1SRHF3eUtrYnpDUHFtcWxEWHB2LzgKLS0tIHNsRzNQODhFallXYmVUTW5oWlVR\nTnlWNUN5eGlXTkpkcnY4eVdPbitEMjgKSutN6W1Hi+6uTAh1GgeUbqcvfVxcYl/L\nCkb6yLrXJQ0MnTDWQHMXv886/TZNfA54r70okDsPJDUcCXHxW+4HZg==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2djZLYjV1dCs0alh1cnhZ\ndDhJK0oxZ213aldzYmtBdHdFbElVb0lqbVU0CjZqdDdOMDVUWHdHblhkUzhyTVZZ\nU0lmajkwbkVUSGlVZEdocklKZlBPS0UKLS0tIEMvdU4yV0tVbFk5SVB1N1krMmFz\ncWwwUFY1UWJKN1l0UisyYW1MbVNXeDAKO2fPu1D25yDLwWlMMSD0MXXDy46H+Bxw\nPUaOMolJ0DqrM8guEtKHHEpMNsv05hD//YUUr14MZTbfgbmqq86o9g==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2024-07-26T07:57:07Z",
-		"mac": "ENC[AES256_GCM,data:hZHud+3mgnA6efmdtuBZpTfiCtdHdf7Dq3q2cvzD1NdhcdkzYEZ3dJjCjcXZJacq/1a07U+afX92SVqQ1XCgtKTnYo+Wqsyw1dDfKXzSpOI5OTO1OtyVvxyiL9/GV1pjgnEi+l1xgnGfzp4jVyH0VK2e/+YddX1lvU1aFRTrEks=,iv:RQxB6ns/GI/gROETAnYoS3S3wAEWN5523FqdgyqqA+s=,tag:dlaLEIULEe23PHijS87hhg==,type:str]",
+		"lastmodified": "2024-09-14T06:23:52Z",
+		"mac": "ENC[AES256_GCM,data:r2Ejx4XTPVKAjeRYK52Q9zAxIXlhQMaKfb+vThiB0lnnwP6dipsj7IEGu73rKkHm7zgK3Rv0wQXL4A8Mco3cxc8jDFvx+A4ALYPs7bm989RvHCK7Cp8BdpErNh+8cigwwJgnNBf1yBA6w38mfDJC4eLswtIroMxbLf9kbQYUUc0=,iv:er3iUoRMfYJufvg9YeEYV/KzZpOsrrJ+v7kPMhmjdnE=,tag:+F62efXe3uVIowQ6bPAKbw==,type:str]",
 		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
-		"version": "3.8.1"
+		"version": "3.9.0"
 	}
 }

nixos/gcp-instance-0/subgen/default.nix

@@ -86,7 +86,7 @@ in
           },
           {
             tag: 'gcp-us-west-1',
-            server: '${config.sops.placeholder."gcp-instance-1/external-address-v4"}',
+            server: '${config.sops.placeholder."gcp-instance-2/external-address-v4"}',
             server_port: 18443,
           },
           {

nixos/workstation/home/vscode/default.nix

@@ -239,8 +239,6 @@ in
       "github.copilot.editor.enableAutoCompletions" = true;
       "gitlens.ai.experimental.provider" = "openai";
       "gitlens.ai.experimental.openai.model" = "gpt-3.5-turbo";
-
-      "find-it-faster.general.useTerminalInEditor" = true;
     };
   };
 }

secrets/aws-lightsail-0/secrets.yaml

@@ -1,16 +1,16 @@
 atuin:
-    db-uri: ENC[AES256_GCM,data:2MsaYcj3evTcFFvIEHvULB9ImP21ApE1EB5zelSWeb9qMRb3b7P3tHK0ctSEJoMKxGJ/iYDaz2753bZ/7ApqPBU5iH1bFaWD1SQ5jpe75di8+Az/jcGxGz1f2ra27EDRNKLbxMRHhs/kb7kS/2TfRC3jvg==,iv:PHGxpnhLpzhlTMe6r282nFtdIluVgTRoSbfNzPBIoC0=,tag:7uZ1TTqhdj4F7MoaynhswA==,type:str]
+    db-uri: ENC[AES256_GCM,data:60yDAS/+wHhbaShYA3C6lem3Yf7RpJGtHKrx4ZpHIH4dyJQdu1OcKrDNO5KEPZPX1XO0d0TiBqS/Kt6ZoggVskZmrCl93C3id8wBiX8Q2JYKdSjYYwMCNFnZLva5SJfiJxFePKTGP5Q6ytxEW8TEZC4K8A==,iv:tNQBAzyWf1cEZJ/h693/XRJW7C3P60nP4/+y0t2ISaw=,tag:5UUGAVMt9nj/xAi71GOfeQ==,type:str]
 cloudflare:
     warp:
-        access_token: ENC[AES256_GCM,data:5MeL7f8WMGJEkFkM5VV30sPQgDomtw6bhr2eg/gre4eo1U3O,iv:Zqz2Y/l4oQ3OM9G3nmYsbAZDheQfbRfJDReVamypSqM=,tag:PTcb5leAriCkYu54Nd7Gmg==,type:str]
-        device_id: ENC[AES256_GCM,data:/gbgfW85+neB4SDWXr5DEK5Pv7hSFiy1GSGTsZJWdPXq7L+g,iv:ItuH41qx5usVevGQtTNLm1Jv59QL1Lqb+JnYVBiSKj8=,tag:MS8DosFRo92juL3pDARa6w==,type:str]
-        license_key: ENC[AES256_GCM,data:tFuZC3MgqOCQJjKoIrnf0h/5I4/EfsUvWk8=,iv:30YIBp+Ivtl+KWApAK01YEfVX803aAiEu8rJjw5S4BY=,tag:bGPHcvoXFQAWk9YFZ4Wsmg==,type:str]
-        local_address_v4: ENC[AES256_GCM,data:Y0mGgZ05kEwO/gvKhQ==,iv:9yfV+iPSbCJNcsETyOXRsA5H5goavQpRoQzrvL8I184=,tag:SKb5s6ISQ16xB50xDmHrNA==,type:str]
-        local_address_v6: ENC[AES256_GCM,data:7cEKKXmxQZoU/7Jmy+QZHvicJm5iQOF67VAzMeGbaoYq00PWWUKaAodI,iv:TOYqosojMOyKLEdU2Qo8XIM/7zGd/xK1tGCE4OZpXZE=,tag:7psrwHTWaLU/VMdjrc2aQg==,type:str]
-        peer_public_key: ENC[AES256_GCM,data:tGQUgM1cyrRwQCSdfz/KneoGwNx64psmLarXh/SLHKh+z+8eO5sNqooorho=,iv:h/2S82myudX6WipTqNtHgUFXvMGRD43XsIxue6/awts=,tag:ijxUL3ugOJJc66dEXfiREw==,type:str]
-        private_key: ENC[AES256_GCM,data:ptZoGmvzyKE+FCSZNd+S15XsxMblY3rnniowaU2J5iitYixgFRRNvHJJN+U=,iv:dIAopDyma1ANLpo3VGtKERDc1+x3tMvRgjjzJUT+Sf0=,tag:IPxX8jg4R6gxztmA7j7q0A==,type:str]
+        access_token: ENC[AES256_GCM,data:noJ3htBOavguIXnfnQSrWze6JENaV2ZYUOK/oshtcL6uegj9,iv:YadNkLO8pphf75Yacw9y++2ctx2lKL7UWEtF7sqZR2E=,tag:i293dORUJd4ik3NcdUaIHA==,type:str]
+        device_id: ENC[AES256_GCM,data:0F9XhZwJyARTiLuSR/5V+QRNHIs+VGTpc+Fkn5lb9bUcLYzR,iv:XuRG+JAuCDPxLm422fV9Q/1C9LhzMTniAY3RGR4K1es=,tag:MYefRDgFiiQqzBxk7bM3gw==,type:str]
+        license_key: ENC[AES256_GCM,data:WUjA+rq1jW7d6C0UxsBdOCZh4H5cRJhAE5k=,iv:0BDdfkQt3cRlEhqlrU6icAaG9dEcKWa1H6KrEi/gdeg=,tag:pHngTLT3PWB+H4NlzkcFsQ==,type:str]
+        local_address_v4: ENC[AES256_GCM,data:5ViaV1ZUQ0isya3+DQ==,iv:LP/PzB10mFnKJaGetUJaT0r8HGInlGlBOXJ+LMdBP7E=,tag:T3nrQLaBvXkbvW6v/YmnAQ==,type:str]
+        local_address_v6: ENC[AES256_GCM,data:8EaHLrKB9K8BqcbMewI3fpbUwODVwt5QPeJTQNs7aN7MkH7X4RFbdbvv,iv:a2/KZqzY9TVIih2uTNT1dtp4kgtPKcNR8xvbNGQqHx4=,tag:qELbjCNNpWO3h+iHe3ItGw==,type:str]
+        peer_public_key: ENC[AES256_GCM,data:Qe3gxFz4Ul5AJLVzTCk02swW70DpEfUDrlnTN2111+hua3wEHttVqFKW9J0=,iv:qq+tt4PbBT4S/WW3TSMxPqq/ugK0YohAz9rMRaYSITs=,tag:mEGhKiBly26S+hUjS5FbFg==,type:str]
+        private_key: ENC[AES256_GCM,data:0WQ3gdsAM8l04/2uOFdaQIRafPo4O8bWd1WYFwPyjpREWEDWMIQTUOSYRr0=,iv:rlMSjTVlydum5EvR5bOw7TwOUNMszSPuOt8Vq/mEreI=,tag:T+zhShSe/l7nDj4ZkGIvjw==,type:str]
 vaultwarden:
-    env: ENC[AES256_GCM,data:ATRBnDW0AJ7yxCXhElMQmcHL+cqrLp3L5L14PEVy8h5LMRnTaMn+h7Ch/rm26S5+KCjd4NJOJ6m7NF9NEjm6b3cQhU51hZ6SDYjssma2w/8SEcszUkKIr8GXOvOp/N9nwgT5lP9Cr2kcNL227g6+KF6y+jK+2bR26RblI03clFN624Mwu1Dbd49ydKXp3Ey6rJhMf295wdDEjln2D2I9NdbnMqKcxuxmOne4kxKAK2+NnDiUej20mviqMqmC0wZ4vcq9bCQGncuNoLCJKEoM8pyPef9P9y+wxM/aFBJIw7DAVMMkMKXqPpT5dfHMAnlUdL1OG+f8l1r/GppK/fdR9C2HgjTR3rLtducMPsu6GxVVhBjH+04ql8F6F1jKBvOUa+AC3ItpI5G4DjOKtn1sqrLQotcWJ7BnkmA9J7mhZRumheVfu96IIvdHP4VhsMVX/ySe8XRf/qIEnSDZTjNJY71MQQd5qIEseDigSml/uemevLxTIO93+SJXTje6ELuGrI/pxDYQlJTA44343Ob2ytJN5H9hdWsk3wvnoBxIN2Q6BouiHjemMH5kpLx+ZcHGrAeqCahrNcvCjdtZO2Jg4HfB8f8ig7ocCbqTtZfCeOEJBQpHtmk01C3m5K9TsP5yqFkisXrKpB1EVrhkvNGw7uc2VXJbNhdPRZ4SXJmt/jVGVcSc6z8sY+B4y2adxnEVaEUN+pR9SRNJ2dr9L+zXphy9ec5cJ47oZTNoCGh7VeagVtkUXtdZE2Bd0CreorLbCia8G4hgpVTri4kxaWHu+uYVuHn40Z/jVkhN3MmTc7fXEpKFYGWaUtUd5M4imbsBmXGukgLlp/3hg7UO3Wz1hnE5LaaxTODN6DpVN4APRJvExfyyw9mDiDoRsv2ZQ2e+,iv:4UAgFF43E/kf0thQaQMX74EYQlOnvif0U2NNVLvtzXA=,tag:QISjz3zmCMUCDgEYt/K8fQ==,type:str]
+    env: ENC[AES256_GCM,data:OVe/qMIevJcW6HlKcVMslxjhB9Qex5bhI+kz9QqBLIHXcRloVx7KWXvTY+fi4kSSKEjBsHhIw6LV7QA2+a9ILzThhFQiEK4VCmBpLS1bnAzFOMUOGbqEgdAjHUmQH2RnnhxdQDLmUdoWG0tvj38Wfq58BUTis+UjrSEzkHT4qUycYk+ZQSv4TBm9/XZuAiMuXhxOo5+RqkhZlWObkjyPM1DfsnH8PHAsHJDjxWAadAqSgJw6T9fwa035WpawoptZ4/uE24RBWE8G4X2ij4gQri8Bpn4X7Zzeb3OGRcQ+Pq36joGcIgGv56oH7YIS9nkeKjBanvY2gI77O2cAkpuumwHEFW/naZORlFmMN1TfNSySr5nPCUx4LrC9dWBIY7AwL58FS3EU7wVxI3QhhYb0BTYXMi8n/1y5Ky3HJl03i54616FPF+I831oXU8OohHmDQ2bJ7KVpybi2X0Sldt0zaAchlkPGJ+scwKbtclpLXQu/QCSfKQI6biVEf6BCyOhcgSYEN5e+oUyqBduAtC5D9wZnn3ArcQ8jzZzCaFyWEaN++34NGDBLlp0fy8mWiWOgzi03zGLLxa1CpSvIis0NeG5j0Myait5XFkjAyZFjff0BFQDmLmq/1K6ge8/HL+6erRPfhOukLnMMXGgYk0yTV5koYxEBn4TXZbb75lBPpdbxfzv96Dz4w8c9GVJ58iBAMA4XSw/Yvkcs7BNpo45AFUrgTkp2/NM01oZg7YS9yyKOYm4Kce7+3Gr+uweRntNM/YAtRK6V6dRvDEixraBYcbBZnehsH9/ww0FMC2a8aXNBMxHOFeYyVNZ50l0lJ3xq6yRprZ3trSYP3g/PY7gGMzsjo7QrT4cAlDyietuHVIjyFncM1/p+BZOHVVEyjBCp,iv:XyFpQSxIVkArvoqkFHNKZJ3P8UC/tNGMzM2vdry/mRw=,tag:CnKIUg2QRqCcNFItk2Zbog==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -20,23 +20,23 @@ sops:
         - recipient: age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjdEQwWHU4OXlaM0w5bjZZ
-            YkFzYWVYWDUzVDRFTmhUR2pIaU5hS1E0MUJFCmZBUzF0RDZqUkRRZ3FIVmJHSVBk
-            OThxU291TmIxRk5KZURObmJ2Nk5wd3MKLS0tIHlSQVFkekc4Q3ZXbVdCWXR0SFdq
-            dHZPOE1Oam15bEo4VG5Xa0JxR0NHbEEKESsoghADUuG6QZzhlb/5MV1tX8A2BO6c
-            DI4l2gcCpgSwWgQzvvAYzbVsbfVF7CCa9Qx5PMqG9L6kUzv7itWFng==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDcmJSMjFEQ3hxTm92dTJJ
+            bi9hSUlUZlc1UURnS3VTb1dqL09aTnRPZlJnCjZ5dWsxOWQ4R3NLRlVadXk4UERH
+            WER1bjl6Q3RicHNjU0lucDdKYlRkWWMKLS0tIGdFd3piL1c2MGlWT3NSNGw2eWJS
+            ZE16c3VWcGV2ME4wU2U5dHVpZGEzSXcKVRXderrc3Psf1RRAEvPmagBOR2aVlxAN
+            6N7pEZPLl3UdAK9hN+pdW7rP82YdAzULe+A4bzRRLdYdi6eUGn9h9Q==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1hzjj23k8ckesm7aqvelndn2hkywts84892tp0xhl0vj7kz7kugcsr9fepp
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBySWlVcVZoZWZNVHpITmJE
-            d0ZlaWJkWEhTVm1Kb3JiWmY1enVDTHY5ODMwCktiaXBLOGhMUmJGQUtKK00zQzdu
-            T0xjVnVjUy9nZkk4dnVZR2oyZzNmTnMKLS0tIGZ4K0dzQS9xN0FJYkNrYUtrcnF0
-            bWo1S1A3TUczaWlNcFA4MEg4dGhpRVkKc5DBWvJH+AwSQZSerDB8cIKoXca3jDiA
-            5+s0jcikpZGOsivL4CZvP96f+9DhDPgiSa88Sl5Amo6oed1dzsk3Ng==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWeTRZbEJITitiT0dJZzBU
+            QlVQTi9VcnhHanFKc2wvR0lSTzc4RUVSWkNzClc1ci90L01HQXBMUElYZ1VQOEND
+            dkQySlRtUVhITDkxNFB5V1ZDU1BoVEUKLS0tIFpGaXA5L3pkeXg5dGpVckQzNjFr
+            MHFDYjZsYlUxcDhQOENlV0NtZ0M0YlUKjHop8jwA7sP5KtqjEVi7OCuQtmyFcP5V
+            lrac5sIrayFBZKx3TQcCc/BY7sX+Ew+BY143E+NA0OfdevtQnDs4hQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-10T04:18:27Z"
-    mac: ENC[AES256_GCM,data:9+Uy7GfxwM4j3jVIre6LCPXlbaU0sG3xAkQTfoKXu6+LiqT5DpzEaU6EYsTE36Syj3KquyOyI/Os6fCiTZVbiadyHA+wlH4qOnBhV1lmlzieEf1PtFfdciBNL0FtgLpw9DZY3Xkc54rAOnJE9hsgC9KdeQ++GsTH79W/e1hoNcU=,iv:IjE6C4gBfHC8fKQVfABYry3g4hy1ioU5X7MnUpwvxak=,tag:c1Vt30kOYHUsbofy7i5Jtw==,type:str]
+    lastmodified: "2024-09-14T06:26:16Z"
+    mac: ENC[AES256_GCM,data:+05Yn0KnJA3/5Kyu4JK3YHgFGfyCM4sQfc+DrrWZ6MMC+gv6YpSN3cSToL2VKduPlqz9BeJ/etacAlTl3kDNfgmtC0dwMaS12z5IJQsCyrSHFnPQJJakJWDvTLeWYi1Dv7ZIutylmP4Wy5XxYZ3pDhGfiqPqxlU8TVsPvDKbEiE=,iv:QyqdWz3ffMor9zg2ULk/rf0L3PvnEvXbEwQFMBpkO6Y=,tag:m53LcrRcebTuOqyHGwjlvw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0

secrets/cloud/cloudflare/.sops.yaml

@@ -2,13 +2,11 @@ keys:
   - &iosmanthus age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs
   - &aws-lightsail-0 age1hzjj23k8ckesm7aqvelndn2hkywts84892tp0xhl0vj7kz7kugcsr9fepp
   - &gcp-instance-0 age1ycgzpgz4vscwfknf2tyvr65c6t95xeffx3qp50r00u83xlpfmgpsx4gyr5
-  - &gcp-instance-1 age12laakc7kq4pndwjs8syf87jtcjc95hshsyhm89pj78pc5t7agueql5juwk
   - &gcp-instance-2 age10zmaa6d5pwsqlxhc23e5ytz66k5nfxhry7fxvtayn0t5jfnl5yws4qe7pt
 creation_rules:
   - key_groups:
       - age:
           - *iosmanthus
           - *aws-lightsail-0
           - *gcp-instance-0
-          - *gcp-instance-1
           - *gcp-instance-2

secrets/cloud/cloudflare/secrets.yaml

@@ -1,5 +1,5 @@
 cloudflare:
-    api-token: ENC[AES256_GCM,data:X1qLmkkv1tXoRNNeRyU6MaOjklDX7vT1h9g9f/pYI4vHNus7dPoI0w==,iv:2ecSHHDHe5qHwFz1H7BKyJWwdil/gTmM9lrJsYDGRO0=,tag:gMK9kz9Dlr6/XKM2rkCbcw==,type:str]
+    api-token: ENC[AES256_GCM,data:HKokJJMWO3phQ5Sg87AbLNxtdisYtwHi/g4tB3Q77l+Uat1GVSjbvw==,iv:9kJQTijVPWNnwZAnWw2wO934QrtyNMBKDqS9QZIB+rM=,tag:Eo5XeNBZt1x/O7UvMIjmsg==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -9,50 +9,41 @@ sops:
         - recipient: age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyVTBOQ2Q0WjUrMlZQczRq
-            UHEyUG8walhwK2VRVVprMUk2Y0RkcFByUlNBCkJDbEIwdkFIdmxId0dsd2haUHNV
-            NE9oaXV1aUZRWTVLcTM4WTdhU3FZdEEKLS0tIFJGcTB5YlJjVGdaODMyem5WWm82
-            OWFRS3JXVFpDd25oM2ZGOFFweldGcXMKNyv1ETdcmJjcB+flMc01YPGJtOc/1ybC
-            IVbDI6hqE5hUFiZdxnDDMM+ViZaYM7TzLjr2xgzsfOU+NTHVj0+Q6Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiY3dmZlJGbWFMOUxwOHdO
+            ZVFVNlkrcDQyMTE1QWExQk9XU2dJVER3MkUwCmFWdGRkRVd4Qm95UEZRUVR5WjRn
+            YnBoVjF1QUhobUdxWUpneW0wT0lDRUEKLS0tIGN5WDlXSlJLcGw1KzBaUlFzY0lI
+            ODJnU28rVklMei9mWG5qQ1YrV0VnVFkKF+mg19xGlG3ZSDiZfZo1/r7xSIrrQwO+
+            WUw9IiKetMKFIGZLCBuhN2NiyZcMDCS8FD+tz8qxUUYbiwcxcC2Ewg==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1hzjj23k8ckesm7aqvelndn2hkywts84892tp0xhl0vj7kz7kugcsr9fepp
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyWU1PNlA4Znl6cXYzWERx
-            bGx5cXNBenkwdHMvYm5STFNTNWo1ZGtVL1NrClNBUlByRk5SaGtVY3ZjbU1BaXVU
-            OTFKKy95U2YxOHhaYkRYUUxic0F1Q2cKLS0tIGxrQmxER3oyckFQaUhZbzRXWlpt
-            YURTcC82Vkc4eWpoM0ZCNkRhWmV2UEUKdqGy5XgVEivVsUBBzf2+3jxoWWjr4hP4
-            69JEh6enJ+LKyl30e9tNdvJhHJAe8gO5+OTcVMNHQtXIFl4IrrD1Cw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKQWpoMTNWTlljMit0eE5l
+            SktOeTk2dzJ0V1pxNWFUT3Ivd1hxKzhIVXc0CnlvSXVTRGtCUUdKanptNXpMM2xz
+            WmVwR1VQMjBtR1grTk9UcmFNVEo5TFUKLS0tIG9zVWVuU2dXTUdyZkZRSmY3R1B5
+            c1hNVGovb2c1eEEzbHRWOXpDZnBWQk0KbRFxJHmqjigkDVQ0DLdOvvX6Bb/wYvZA
+            sybvOJ+MZmQNj06eYv+Ae10rTeQsISTVtMxAjPM6y+Q8M8MfsTElBQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1ycgzpgz4vscwfknf2tyvr65c6t95xeffx3qp50r00u83xlpfmgpsx4gyr5
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDWFdaSEllTHg2ZXFvVEM4
-            Y3R4SjNSR0srRzlXZWdtcVRRODlpS0lxYkJZCjR2MnVleFZyM3gvVmtLZ3lHekFU
-            UUdENjcyZ3lUWFNuenZVVkwyVC9PSlUKLS0tIG1tVktJWDdLaEIwNDRkQmNkUW5s
-            d3N4M3Z1Yko5ZEo0UUc3aVVnYkU4WDAKDSUX1wt5CyubMu1C+Gts0ZVhUJXjgFsI
-            uQ+FAM4RW46Ghe28RhEErVMpxdI2OEV4oz/JSLFFgU3NhCcr9Tlikw==
-            -----END AGE ENCRYPTED FILE-----
-        - recipient: age12laakc7kq4pndwjs8syf87jtcjc95hshsyhm89pj78pc5t7agueql5juwk
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5SlJxdnM1bkNEaks4SFRQ
-            L2pIdDg2Tk9VMzJZRlUxTGxLdGpBZ1RpOEFrCkgvaEdPT0owR3RuelZZWE1oZlpN
-            RjhlVG1MU28rclNUbkdPU0NVa0VLaGMKLS0tIEd0akJ6cXVvbVdjUHFydC9hSGpa
-            eHFmT0ZIZVUvMnRJYXpPZUZtUU1LRjQK5p/MQb7zVo6e5Y1SNi/BdM+Qt0F+u/Ux
-            GvJqZ3/fjzmPEkEsEmsnVKc0ZG4GvGceRxwvmcL0BSoNRLjNu0neTw==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDb2N5V281Nncxb1ZjcElC
+            TWl5SVU4UCtwTlFCdnhCa2dsQ2FSbjhZQlRFCm5vWVl4MzVPcHdBMDJYUThkOVJX
+            ais0NEhQSVErSEh1OExjNlZOdy9vVlkKLS0tIDlJRVlNZ1FWKzNCSFNHSWxzVk1Z
+            Tm52QXh4T1JkeFhWVjdpUUxKN05HZFkKjk5Fp0JEE7URwFY7Wp/hDQb/a7ySgdKV
+            NGc7g8mALV5JmINF6M306MinYhTjo749vAlFOjGEuuPjoJXm8+3U8A==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age10zmaa6d5pwsqlxhc23e5ytz66k5nfxhry7fxvtayn0t5jfnl5yws4qe7pt
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2NHA2MFVHVXYrdGZwOHc0
-            RmFsYi95RUszbFVhRFluYXZ0R0d6Z0V0bkZRCjY4emxPM3QyelVtVkRta2hUYnZn
-            aURFQU5oZDI1L3k2R3JuUmRnNGlSQUkKLS0tIExvMTh3VXVVTFB3QzI3WnZCZGQy
-            RSt3T0ZTK3ZBQVJsckkzT0J5WFAvR1kKVBp1sY6xaYJA5pLEoKwQWIjgEuh0W61A
-            dvTIG01otu2fiWpOutEF5ZCf5d/enl8NHtIz7Jw89XDHwEM5c5FCsg==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQcEhpRE8rUFR1SURHYU4v
+            QVltSzBEd3BsZ0lhTTFCWTh2UFpTSXYzdXpjCk1UeWRBMnRtd013YlFjVDQ2Ukhk
+            YjErVDhycTEzUzF3NlRxcGFtOTh1U0kKLS0tIHdKRUViNVBENTNpdWdJWStjdWhI
+            aTZ6dWRBNlFxYjFQbFNJeklkQ0tucXcKeJyF48FzzqyNgiXYeiUCY+311t8rgdN4
+            ESNJvaiS8cp4xasmOSweKsv/8gg44ftTHXE9cT9BVjgRom7Uj+bhJQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-10T04:18:27Z"
-    mac: ENC[AES256_GCM,data:WGXnT5GijioawnIp5kJsSIKTKvG7n0HZLeyQFRK45tzo3Qdjr4F+KvtUMKUN/BjQJEV/etl021znurOViS0J2P1PwM6bJO2gvqWPb8K8CyrK8KbgWruhENYpec5kLtbtzg4ghJEcFh0wEw/wQJ1Z4NQPMNisTYVR2ewvrr3dNIs=,iv:wirAx/2Dha+z78Ru/iXVITYO8zqjyJdnR8YUe3HAnss=,tag:yPwuds+loyDOp639gY2Yrw==,type:str]
+    lastmodified: "2024-09-14T06:26:16Z"
+    mac: ENC[AES256_GCM,data:1eIf7L/chvGFsmHou+t8y4C8xivWUrx7506KEQfHlQBtrd0XwlPFLAcJ/0H/jA1oQbhEYVS1ZUSTZmblGxDT80zqP93hYsoP5eOjBGUgRzD1C0AI56jcFJOUD46x3LIbWewZI1Q4AzjECHu3QotDrnijhRsVW9qke2x/+mIwusY=,iv:uye62oizmJ8fGdQ+8u5ceLf6lbDrNGO1IXqXHjwmiGU=,tag:6RCT3AfjsuiIhj4HiHlVqQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.0

secrets/cloud/endpoints/.sops.yaml

@@ -2,13 +2,11 @@ keys:
   - &iosmanthus age12409ktkdynl48p38wz45pu2s25kmffsw4p9d9vgt3xmmwl8f7q7sjlxyrs
   - &aws-lightsail-0 age1hzjj23k8ckesm7aqvelndn2hkywts84892tp0xhl0vj7kz7kugcsr9fepp
   - &gcp-instance-0 age1ycgzpgz4vscwfknf2tyvr65c6t95xeffx3qp50r00u83xlpfmgpsx4gyr5
-  - &gcp-instance-1 age12laakc7kq4pndwjs8syf87jtcjc95hshsyhm89pj78pc5t7agueql5juwk
   - &gcp-instance-2 age10zmaa6d5pwsqlxhc23e5ytz66k5nfxhry7fxvtayn0t5jfnl5yws4qe7pt
 creation_rules:
   - key_groups:
       - age:
           - *iosmanthus
           - *aws-lightsail-0
           - *gcp-instance-0
-          - *gcp-instance-1
           - *gcp-instance-2

secrets/cloud/endpoints/default.nix

@@ -11,7 +11,7 @@ in
       "gcp-instance-0/external-address-v4" = {
         inherit sopsFile;
       };
-      "gcp-instance-1/external-address-v4" = {
+      "gcp-instance-2/external-address-v4" = {
         inherit sopsFile;
       };
     };