fix: sops

2025-04-18 17:30:15 +08:00
parent 05cbac2096
commit dc07455b30
15 changed files with 86 additions and 52 deletions
--- a/config/hosts/imxyy-nix-server/nixos.nix
+++ b/config/hosts/imxyy-nix-server/nixos.nix
@@ -25,6 +25,7 @@
  sops.secrets.imxyy-nix-server-hashed-password = {
    sopsFile = sopsRoot + /imxyy-nix-server-hashed-password.txt;
    format = "binary";
+    neededForUsers = true;
  };
  users.users.${username}.hashedPasswordFile =
    lib.mkForce config.sops.secrets.imxyy-nix-server-hashed-password.path;
--- a/modules/user.nix
+++ b/modules/user.nix
@@ -18,6 +18,7 @@ lib.my.makeSwitch {
    sops.secrets.imxyy-nix-hashed-password = {
      sopsFile = sopsRoot + /imxyy-nix-hashed-password.txt;
      format = "binary";
+      neededForUsers = true;
    };
    users = {
      mutableUsers = false;
--- a/secrets/dae-imxyy-nix-server.dae
+++ b/secrets/dae-imxyy-nix-server.dae
@@ -4,11 +4,15 @@
 		"age": [
 			{
 				"recipient": "age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvaVp5OFFWVE1MTVY0Y1Rk\neDU2RGx2Mmd5dzQ0QzNkZ0tVbEZId2FCUmxjCjJLMjMreS9qSm9mOGFIMjYva3JQ\nc3Q3dVVOQ05kZ2dzRFJ2TXRndmVyakkKLS0tIGFuSExTRTUwbE9Tc1RTWTVkTmFJ\nbkNsNHlSVmtzWWc5UkpVbG5KYWc3ZjQKb16GEKfjt8nue0DKk27gwVoMpSPweJdT\niBwcxBVI8Bv64yTuA7Kx+TlKBviCykjWcnyl8AmQ6n0nkgzZpXkPZQ==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByaU14dkgreDl2MFhiTEpQ\nMDRSYXNYbkFLTTN6TUJ3WlpqMm93RTQrSGlJCmpma25OcnNVL0grRmorUzVVa0h5\nU1dkckZJZ1kxTmVSdURxSlkyNkZkeXcKLS0tIFl3UzMxekRycnhmVFc2NWtjQUVq\nU0hURG5HRWpnMmt2d2NqNWFidXlZQjAKTi2hrHmnq/xkCR8iNe/f1//PX+GL8De1\nvaexX5DXy1cUHXL9gt18nn/t3zKU4U7wvqovHjDySJtMdGwD7qlzMg==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQODJmQUwvSVUrSWRDdDVI\nZXdMbkNiakgzYThGckwxdGwyYjl0bU50Y1JzCmltNDBwTDFnZGM2aXFORUc3Mm9P\ncDl4WGZyV3Y4T25DYU01VEF1anZ0TmsKLS0tIHNjcVJRa1dPTmJSanIrcFY0QmI4\nc05EaGZBaUVZcUQ4K0NlTTkwV0Z5NjgKNBOBTXMC/b3xZBVQe9iAzkKkpxt8WuG4\nChqVrxqk5cVAUuiunjGFVSd4YpRJQ1J5TdVPsXrEeDs0lBio4ssk1Q==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBncVhhTFB2Wi9jeldsSTR4\nQlFJd0E3UUkwcE0zbDlWU1NGODU4RG5IOEJjCnVtTEtKK3czNzZCSytZTEdLQWRF\nK3paVE9Wa1RxekhZTEd6TEZwTlluaTAKLS0tIHJYcWhmL0lBTWdENkx4VlVEbUhw\nSlpyYnFLdUlXSDBTWDcycDJFMG5SMG8KioTfeF0feG6KjFMIow9ejkuhLnylqWVn\n+n0+xRp7Jykwegorl+5DqW/MQIUzAweLGXxofBp8obs0Ja4CUVCJFw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxNVBGS1FpSVFwUUFtTVRI\nb1QwVUE5SVMwMWdmWUIzVldEMjhvOTErWEhVCjE5Z0JwWGJHVjdLRnVmczB5eHk2\nazBVdjkxSkp1VUJ6VWhjWEo4TDZ6SzAKLS0tIGdnd1ptTE02Y2t6TmpPTmdVRzlO\nWEV0RHFjR21mUXZiUnZNL0JzU3c4V0UKGdx5H2rP7e2bXmtWB+abgOtWyXaXTeRk\ndCdlC/n9rr2Rj0RZp651P17OSLzkxZ+deArBj8I3uFDqI2nB06cb2Q==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2025-04-05T04:26:42Z",
--- a/secrets/dae-imxyy-nix.dae
+++ b/secrets/dae-imxyy-nix.dae
@@ -4,11 +4,15 @@
 		"age": [
 			{
 				"recipient": "age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXME1YNmR5Y0prTndLRDBL\nM0xMaUxQbDB4MHZOQXh6SmVUSGpIOXp6VFF3CjU2UkZldGZMbCtwbkhUZk8yU1RM\ncTJobG90M2VMV2p4WCs2SEdiV0s3V1EKLS0tIGRlSU1odG1PRGJwQVJTVkJaLyt4\nZEdoeU03VjkxQUxOcGI1cTB5dGEwWDQKijyeTfFDGkDsU6H7AbKICH/or9q/NSoP\nltlo84+8osICAOaZ8mx+HZGmSHSPsWCbGJkokD8Y7NhO8G8IwQA+vQ==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyYmtRM1crTjI2MTFoVGpv\nNkdob1VMOUIxUUoyZFdHaXNaUk5MYm0ra3o4CkR2VW1uaE5keEJiOFNXV1NRd3Vz\nQVRaWjRjWlBPbXVlUlhMQ2lsWnYzZDgKLS0tIFpoS2FzdEIyWWg4bDVKekR3R2Za\nbHhxSjVweGIwcmJsSExiOGFObDdIdXMK07Xy4unmz2aL9SC2exIspIXeRWyhq3tn\nupboF4JMgO9yDWT1851Q903cM5TPBoNbCR+iLoHDx1tzYDAZdOZ5LA==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaSi9TY01tbURjcmxqMTY2\nRUdPZU1xb0F6QlVObmUzL0VZWE9QVzBsQWlzCmw0d1BVOGFVQVprNW9jOFNxVjY1\nekxpSGZIQ2VJMUs3Q21LTWVsUG9JWkUKLS0tIHFRSXBZMTZUZ054SFlRSjV1eWlo\nZmtzTU04TG5RTGhCZ0hWUUQ3TXk5aVkK3aGcAWAJwh4xDX8SkoPWW9NttvxDfgy3\nmZ1pV6LS4i+0CPddc+qxGsrOpxMokZE+th4yU3pAVCn5c5cnOfSSVQ==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFb292UE5EUHhKSUljTHRm\nTGZ6SWpxQXlJOEdYd0xPTjlkeWlMNWdFa3c0ClU2TDl6Z1dGdzJaY1dDeDYwVEhK\nNzJ1QnI5bmxLcUs3dW4zdEtzYXp4Q1EKLS0tIFJ3Zlk3NVNkQ21QcmRpdnpRTFo2\nQzhLTzIxdXY1V0g1WElOZURPNHU1TlEKXrzwAICgccgX0p9tuWAkhJGg037e+6YI\nIn9ePPtZnQvdR+6VMpGsWLTEzs9Zq07A5adMgChL4nQ5kiZMgpV1Lg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFdHRjVkZKWUtPMzhnMXpx\nY1k4MXVBSmpKV1pCaWIvNzdHNWhxTm4vZzJRCkJYd01UNU5JclYzd2tOOWxpTzla\nZHkxM3l4eU43cW9sc08vRmhRc1RRbU0KLS0tIHNaYnJhelZBNi9sSW16aUpCUytJ\neEFyczYvRjJMdk9DRDl4MVVDTHM1OWcKQjS2lAu/32rpvkzyGPxQyglB/g0MDnjZ\nyJvzad1eoKMwFcGuc6aahXgmMY1SJUSXlV7BaSB+r6PQbpQcNzrdPw==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2025-04-05T04:26:25Z",
--- a/secrets/et-imxyy-nix-server.toml
+++ b/secrets/et-imxyy-nix-server.toml
@@ -1,24 +1,23 @@
 {
 	"data": "ENC[AES256_GCM,data:QfLWRYmj6TwA4uad+lZ9HfDOpzMqafIUxVhh97bsfl/eU16NGcm88NhdqFixzfGKY0jcGg705Qwh4gGSTnNg1zbdPCX/Id6rgBHhUR/XHYe0qrQ2iDaX4t9NqmlDOlnkHJa/ApaddzEZm/Y5NJqJA8X8F9A8xwNCw0TWuAlok3Sb3pxRNhKjbU+76lGpk8xr4kX/E9PKtvwVCzNtPqo7gQlwVcxDlwTUe2rMkfOpc/CfQpJOieDdHnQ8SYoatwgG+sBs6UOjASCKra3OyjhglwSseGCINybtCfqmATrb/iWpG9SNa5PBwjm8zknOJWAfwN4o41ir7EK1Uuovcuqh7EnBkVAV6ruTiMvBuOVCzK0Lgktcc7eI4VqgHuNs8172rb2f54gSxu6K4uzG5HtabJEuOG5RLlOt+3k+ewYLC5zSONPnwbHqMM0DMXyv1P9EC4hpoEaDtN7RLTiQBgaP+e0dZaRMjBbnyQZI7AFXdzCpbCPWIcOqNJCs0946lNLevnsHBo5ymBX4YMLBrHnq/cjo01MpeOJTgieBTFmWLFy4vlXuESmplp0SArESRSNrKVMTC5a7U4OkbsKVD/kzzgQaDSqsrhYH26bcOsQqklcDswOdfItSileLQlFcUyGBjh+MetoH70H4WYlZjahqYHk9t0sPjMs/0JjABfakRSGv1eymc7sxF4OFrEIAG3hU98vLphtvsUbzdQM=,iv:hP3NaXOz963dor2/ivyBOEN4yzr8Jo/lGMbV1lA861s=,tag:2BANLVtI0nYZC6S3ZdJsBA==,type:str]",
 	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
 		"age": [
 			{
 				"recipient": "age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxdXlyZjJjYzNZdUUxMnpl\nYzU2aEI5QkdrbG1uUkJvaWozSXMwbU9DZ3cwCldnbkkyaVFOaW5zT2VITjhPcWts\nUnhSQm9nV3lXREFySHFzUXpJM25ZUGMKLS0tIFBUcW5yQkVrUmdQRm1pcnhOWW54\nZVM4eVB5RkdBS3hpK016SGdPSWVZUTgKDTUexW0QKzsYa40aJgghLt080MOkAIKt\nvSsQZoRU9ArFI4XqPy3b1BmKZKASGb8AM7KdxkqpwaA1tjLaHV8CIQ==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAyZG5leDR3SjhWcFFHMlpX\nNkZxc3cyWFRCazZqdEl2NVAxKzJhbkNQREJJClo2V01GYVpEN0tqOEIzSVVSU0hW\nNzFVMjhnSkcyQzFFSlpXSkpLWXJQVk0KLS0tIHFZM0V6Q2FWc1RhTWt5c0RGcXVB\nUVVSOEpNcllnM0pDSThjekpZcVc3TlEKYaYylNY/0gnWCaon0SrMDsVNTp7pXxOw\nr9+yYlaD/JQjOqZxuLYDZ27PxLwhAzRA2uVnHan2QcA1Yr84xMVNlg==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGTUZjN0FqbUtCQ3RFUlZL\nRXpSTmRWZ2hSSEJIVDdwMlgrc3BPZ0RIQVVRCkNKa1hKSjRoTllXZ2VuN2ViZ0xM\ndXNEZzNlOUx3Unp1NFp3SEk2UkdGVGMKLS0tIElnMWNBUDBNYmdLSDZjRVhXckpZ\nR3lLR2xRS3BwV2J1bXR5Nk9tbDdSdm8KHyGKvn9lyigNTDx81dRYjdtibxcfmpeS\nzKI8bA6nSyFqvweXlxxRchC1g3v8NGjMEMhin14lKyIzBzsfqoULAA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBUEllejRyUU9kZHA5MmlU\ndG5xUElFZG1OTzNGUytVb0Z4TE5zL3ZrejAwCnZaT1VTdWZxbVFOU2ZZMXMwc0VX\nTGp6WFMzSk1sV2xOejJ2VjR6QnFpWEEKLS0tIEk2dEdXaDhsV3FnSmhXQlhUc21I\nY3pMNVExc0tDV1crazIvODg5WUNYdG8KliiK+R1cIYw9IBYOxdpC/oZNKQqdbUBR\nDnMjZVqL8zn3UsA0glCBcz3gER99Pzg40r94/qAg5t6T4YJ5ByzJBg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjdGg3QS93dHd1N3ZmMUpl\nVSt1NWplR0RoVEpTRTFMNDdxbVloclJUR0NjClgzalltamFtV0lYUHI5bUdpb1N1\nY0Y2NkxNRnVVMkJpNHZVdCtFdUdYRlkKLS0tIE1CNVYwbFFDUVJsRVFZR2c3cndU\nNTJncVZ2NkdXRnhKR1ZSdGcrWXVrK28K9pUGqIy3hT7VZ5JRcLaAZtGG1VxEPOlG\npDcrDoTRmZjAtaTLXu4bgQTUQaDa3iRWlm9gfRzAa7jSlu3M3OTcOw==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2025-03-02T03:25:42Z",
 		"mac": "ENC[AES256_GCM,data:nfLHwjKLtiabq6qEhnFENrwPIH5Aehyng8Nkl4IuBc18fjSEmFkktS5U2lJaAUPNCvLoSA69icGTRk75EflyHXGx0w1j+EwTWD3/OrNxyEr6z4gSLNxJkGRjMJjuILhkxJ+UU6X7rCqEjMCuvUz8IjGL3llPBnRTUb6s9ynIGCo=,iv:TspuM0wfklVl/yTsv+/iVPNsT+AuJ1gJe3nLia5cD+8=,tag:nt+ZJZfjWzlaByOxv5944A==,type:str]",
-		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.9.4"
 	}
-}
+}
--- a/secrets/et-imxyy-nix.toml
+++ b/secrets/et-imxyy-nix.toml
@@ -1,24 +1,23 @@
 {
 	"data": "ENC[AES256_GCM,data:ejwOSJ4303kClavS4NqbhFRjSPscnxeXeF03Eo81Nq29HziRPMeFVGLuSP7T6DY8a1MEtFd2Rd/OAfcNP5cx5WxsmwMDeWJuuZ0FDFtH7eRpbvwEk96nqWiIVUFA+GejRr9OL8o8Y06HnZ6wHQfrXSJeFA0d6Vs5VJQExj1SWGbJNPe9uKmosuq1exi1QEr0dHx+/T0YXB5kNH/CSJw/sSi4C7yaNu3+nKRy3JGGz1X+mWYQIsAEHeAgNGU1CDH/UiayTQpQL3QeJFW9KXANDm4afUWVNLtKOEvQco7c7yigIAmAmv8JpKVqHcHrbv5+shph+FPdLAjIU3+C31zAkCaRNJd1XmUC3ipldPGmvxcMC8W3vb2qmrHi6YEWY9etCli+w0PtMtH5zbC/gnCNeZ+/eQPNiO244oWAyCNVods3daQjv9RU5ZJcEh2E5xFLUc7lqiHhwT8p5AQJ5KVASjIxVxzUpzH1YCdIVjTUxFCW2xOfKIqpNPsKzeWkwrM3+5vrJkHpONGX63WcrK/oyIAgHiREkAJAS2SMXn9KzvkeFSnPxuh4XZTsDN+i20kxkGjEPdiJ2DdTVERp0aWE3NLJj8euBW+pxmkC6dS6w3ss43PrR4Nc+a2qMBHmOe3UNDe3tAwX/SyU,iv:tTztR8DMMKcV97Fn2tVk43jDDSzYVzHP5SE4Ah7TjTA=,tag:4xi66fK5/Mv6fh75Gff0HQ==,type:str]",
 	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
 		"age": [
 			{
 				"recipient": "age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNWWxRK2VHSEtmQSsySUJ2\nTW5kbGYwa3o4N2hLU0hzL2NFeFJucmQ5Z2t3Ci9NMkNBb1k0RjFiaE45QmxmZDds\nclNZU2Z2akdlbUFCS29SamQ5cERDQ2cKLS0tIGNqdWM0dWJ3R3NZaHljeE1YVEVa\nZUd3Z1ZzNmhHOXFhTVBMaVEwR09QMFUK7iYM3Gc6rBd9wLJMeGGsbJ5ydUn+FnM+\nFJE1fkjXQckFvk0rO1kXKF644cbLagDOLTQEsRoAwL/HHOchFaFnKQ==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvN1pOYzBlc21idWIzUHl1\nMEN3UFZwOWpzYUFTaDBFbTJybXB4NTlKUVZjCjRvM3VwYkd2Tlo4QXZSaDZyOGZL\ndUpqbmRVM004NitOL1lJQzc1QzFsbU0KLS0tIFlLcVpNbFp5VHpQSDZ3MGZWSGVh\nRlNTNnRrd1UyOGVpTFdqWWNhOGt1UXMKjvkqHiO2DFhHgDgXhF+Zwc0K4CyUzFTe\nf+qEDCxXPCUQR7z6H/UDYWGgQJ6e7cjnXhc2ZgSFxk5JQuV/lRd3AQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkU0NYT0FrbTIwZzJNZ0gy\ndW82OHZkRnB0bHpEdnBXNFZFeml5NTFrU2tnCk90UmZSWklVdVNFSUR3WnFCTFlz\nSzNXT1ZRRnovZXdiZFZmaWtLUVprbVEKLS0tIE0vTE11SmtsakdFN21XTDNPajFU\nYUpNaWRYTTVWNk5EQ3dXTjlaUjd2TlEK7tAAgMuOphvHmlST1WZsF5A/Fni7+KGI\n6v3x3Ec6HLkZm0dvbdiIvXxQMCJZTn7ltxc66XGziO+nherTmI8dwg==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmS2tBR3U3cXMvaFc3OEFk\nMExqQUk3QjMrZVZPaVJoN29wTFhCZVVhM2hVCml0WHI0K25ERFFpWnFpL0U2RzJC\nWXZxS0dCYTFnSHJ5UVBpTU8rUTVXcHMKLS0tIHFvVDJhRUN0bTc3ODBORURwWjVQ\nNEZVTXk4KzdhOVJyRkd4SHpoNURvODgKQccupMiw6WTpG0eJjJSNSsSIHcVdS0cH\naPP26s1b+9HUXy8826tDmjMyYE+Tk5U3dL/hbzVeXI77B/2IFYqdEg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNWGZuUkwvVlZXNHpxQlFk\nWW9KWXpvMFp4aU02NWJ5N3NBUHBzT1ZTVWdZClJTZFV4ZCs3dVFWT2dtdkhKdVg1\nV1lwVi9vSStPdmI1ZURRbWFTbGRwbGcKLS0tIFFrQ3h2clY4a1hrdkVIb3l1ZUFO\nQnBrZnBUMDFGRFJyZ3orRDk3aDNOYVUKsRH9K4gONKykPLbI1Zw7gM6BtqLw0i2p\nZlRVuzTsu7K45n7NxvGejtBxklZcioIVYXQ5CMux9CFexUqEsKku7Q==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2025-03-02T03:00:34Z",
 		"mac": "ENC[AES256_GCM,data:aRyMLpLOd+0lea0rvBsmUkB7TICyLERl0U1hYjadowIWhZsv5ZdrppAwpqljnqAcgnAVqMMLVnwsomSCJCuslLV2i5U/5uypIMzQR+8pFy5l1A4bibuUxqfFl/gQ9LtdqWnXg0QQgu2/KSVFvQnRN7/5QiOs2ELyeyIQi/KAQP0=,iv:DEqMTuabm+S7JuxxRD/T6AhJDn25MSDEaVsU4Q2to1o=,tag:gZ/+hGS0xyTuPySfF0Jtug==,type:str]",
-		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.9.4"
 	}
-}
+}
--- a/secrets/flatnote.env
+++ b/secrets/flatnote.env
@@ -3,10 +3,12 @@ FLATNOTES_PASSWORD=ENC[AES256_GCM,data:jC/lVZPDGvcYzXhdnvjs,iv:0O6nNNlWjD5OWIa2o
 FLATNOTES_SECRET_KEY=ENC[AES256_GCM,data:I8zrSTMRnPNWn7u+KZiQW2YdpAkKOBxRKv7ov7dLLNA=,iv:I4YP4KqyMR6jfofEdYxQ+I9PQjTNQwCgnTUfHnDW55A=,tag:P7QcugaQWMCfb5+G5JdMXw==,type:str]
 PUID=ENC[AES256_GCM,data:ZA==,iv:xfnOzfWvf7gozw9YMTAw2uarfsGHRpx3rsEN5ja1k7w=,tag:yuXkWMkXAUpF7h+AaYW14g==,type:str]
 PGID=ENC[AES256_GCM,data:RA==,iv:m8CO/d9Gh0cjc4QYX6CsUx87Vu5iqtU0uVOsA3AeWgs=,tag:Ri0arOjuwRC83fz4EynVtg==,type:str]
-sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzSVNSS1A5SWtCM1JzNlJH\nUTRGOUVmdlYyNE9EWVo5VExtZlkwSVEwSGdVCmhzV0xNcDF3alVuS3ZSNzdjclQ5\nNnBvVXlXc1VVSTcwV2VBOGNTUnhZRFkKLS0tIGYwN0NQVFpSaGFaeTMzZVBEY1oz\nYUF2RHN2T2J6d3Y1akl2TXc3L3l5QTAKrL7M9k9QcgI/3oVaYqFgsQgGFB7toRwz\n37mL9+Etqr3ayOLUplYGmG3lRT2MyUctC8894KmFnER8hQCzTbYBaw==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmcTgvNjBXaTZCMURSQWpQ\nSTBWSFc3UC8xTFZ1c25QUCtKNDR2VDVkM2tFCkFXTDJwVTRzeUtYKzd0SEkvYTh1\neGl5eU9hdTh5Y1NLeWREUXBVdmFlNFEKLS0tIFhWV0F5TEIwZERvZXJVN2tFNFgw\nTFViaUhLTVRJd2djd2NIZUdPK2UzL1UKMTdQfmbMRs1tybLW2tXtuEwbQxyEgrrd\nmqzgRJIMbYBrj25sWALEks/k7EI8XNKdPsiRqy0Rk2NNER7zrVOEoQ==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_0__map_recipient=age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns
-sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCTWNiRi9objhVNDh2VHFL\nM25VdXZXeHdmd0hEcjhWbGpSYlNyUlovOXpJCkM3VTFXWGVFeW5oUitJcURQSjNn\ndHloNVJubVRRSnNMYTBpTFJYakJ3N1EKLS0tIHo1SW1oZXBRZWVxMVlWVk1HVmxw\nSnd0NHc4NklUa1FrdGZSMUJjR1BvT0EKxRriwZQefLrbIiG+RCUMjWee/C1cxF4f\nPU8ojWlxkzzNvZvydtUzLJtUSRZw9wH955Sk60yVtzlB0nczmQOZCA==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3a1RvNEpTMDBXaDJzM0NX\nRktrYVlxVkFzdVZvaGVuYVU3YjM3ZmxHaW5BClBpd0FFaitKSDdJRDh2dlp5Ukhz\nczd1U043c1d1bUs4U04wSFp4TFBjS2MKLS0tIFBCaDJSeVpwWkRYSiszRnJQT3JM\nUzh0TFdUN3JzODBla1ZxbnJoNkFrTDQKaRnYQ8nMOgrR3ulf2Gdhj7SdGj5w/gSY\njRaM3yDcfBnCY9Rz9Yzw0aRVJ8eTIYvSngRxMH6POxwl6wq4OzpE6w==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_1__map_recipient=age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6
+sops_age__list_2__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxcHRuOGRGMGt1L2t4MzZR\nZ245RVZNZ2YzdXdhUXkyb1lzQXhXNjZNMkNFCmFJdncvL3NsUUlyaVVDL2N0MXk1\nZ3B6RG1XRmNZNGp4NE9OMzdSN1dVeFkKLS0tIFA5N1grSW1yMXNvYzQwZWdBRCsv\nL3pyTG0vcUZ3bDZQQUVxeUhjWGRZQzQKMjWaeDon6lp7/8ZBlKmUKJK6LuQj6RCl\nVSc8cMtbeBQMvyxfjurICgN3i5P/GYgCodPhWmChdhyX+bfhegE17Q==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_2__map_recipient=age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8
 sops_lastmodified=2025-03-02T03:46:13Z
 sops_mac=ENC[AES256_GCM,data:j/JqiPLHw6a21iJV/qNhAr+4kVkCnXG0uYGEJ4m5K5UerN/nXLzVafa7ciaMzBC1k6KBZwSyuKcQxJt3Q5+R733AD97VgrClSAU8w1pQhlWAUpzD959PwW5dTX8N9G+gih0xcJ5RsMALfWppeTImAAyAoKo1mtxE2MtfQZw1DU4=,iv:jYM3YfA2cbDjKVLHhQ8Rzv90Rg2R4iiY6zFL1N8knv0=,tag:8wRhD2XDZXI9v2j5XHKtqQ==,type:str]
 sops_unencrypted_suffix=_unencrypted
--- a/secrets/frp.env
+++ b/secrets/frp.env
@@ -1,8 +1,10 @@
 FRP_AUTH_TOKEN=ENC[AES256_GCM,data:CXFJwOOHEbtn1PI0TQc=,iv:yItYliwZGxZs8YAWksV7BqJP3TUBadxXpf99J5nXR3A=,tag:9earTQfuoLO132UZnTjlWQ==,type:str]
-sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3aDUrd1g5eEdDVjVIWDZr\naXFGM2VIdzBwT3UvTG91aVYzWXNPb2FINkhNCjN5eUtUZVdmOHk0aFZHeXhEckRR\nakx6VVo1TE1XaHhNei83YTJsaTFSQ2sKLS0tIEx5Y1QzS0lvZW10YnRidjNaNnND\neWxBaDlibUJhWWl3YXJGWko5a1RUb3MKQkQfg4pBD/hXbtpF5z8Q5Ue0hKF2GywE\nuhWfdHHsjoMWaJWtHY3QQt2yEW8ETOD4wMbL97gJ27ELyiihbYt9MQ==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKT1lDSnNRajJ4M2tDK3Ni\nSFRuMzVMSTB5NUtMNS9zQStDaTJpNm4xcVNnCkxTZnBQYmlqK2FoV2FrRXZrSUFq\nOGxBcEhySFNRdWVGbGNHM1dhakYzcmMKLS0tIDc1M3BTRHZZc2UvdHhoRFBqSHFz\nS0dSeTZtanNYNnJXaVVFQUtZRzJ6Y00KXKPIujSeCzL6n4Q/Ahesye7MldwKanA4\n2IIO+NTVX7lPeqLoOQ2AYr1Dt3qh7WwG+ThMzrgjIH0Z5iKn39rhAA==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_0__map_recipient=age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns
-sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpRStZVjRYYjBYRTl0SUht\nc05acS81VHlFZllPZGdjTzZtRmlXTHRCOFNJCjY5Z2hjZjV0Y1hUZHVCMjQ0TFhT\nSVBKNHA0Zm9jTjJRMHVoNWIxY3dTb1kKLS0tIHYwWUxWZWZYV0VrMmVEZ3BNRk9i\nZGI5NVRFTFpmbE9HemtSUFhQR2F6WTAKd+AFLCRq1aszC3wbN5BQYNxxiXAnVFl1\nOZXsqSOvzQMcBD/NIE9Qz7aNGp5KT2Igx2MkPLQ7PxF9gt5F1T/v0w==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2VFNXb2hVTzJQVFRtN2xu\ncm5mN1BXSmR3U1Q1SnhHQVpYUHR2UWZlQmtrCjZ4a3ZINkF3Z3drMElGYjRxS0Zv\nand4MDl2VWpLODM5UnV6TGMyWE1zYTAKLS0tIFI3UnY2T1pSeGtjWTd6MU1iZXZa\nVkNFdVMzMm0vd3pkVi9lei9Nd3lmMmMKaWpEFYKZW0xaXEoQfgR5/OOXLiqw3wNF\ncEkvJT6HzUOsv891ZmZlsN74ucY93V0lLh6NpfseLHIzAH8b2M2N4Q==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_1__map_recipient=age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6
+sops_age__list_2__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJSTVqRDMrRDBpZm5sbnU1\nV0ZSck0yVVo5ZUpNcHZzclBkbTk4K1cvMUFvCmEwZHErRzRrMThVQWdSK29PZTlX\nVlRwaUpoMGtzV1hWUU1hOVppeVhSRm8KLS0tIEZiNmNzaUFubkdFSVRpekJSVkU4\nTFpMcVEwNDE2Wm9ZK3hMZzJwRjM0cDgK14sLSPkpDkuDk5tGI+seUTYOh6/uzJsI\nxf4WE8lzxFh02v2RpyZAN2bqPBcxbTIic0gGlceTPH0/lwgUTjC5kg==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_2__map_recipient=age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8
 sops_lastmodified=2025-04-13T06:57:07Z
 sops_mac=ENC[AES256_GCM,data:WJ9FCO78LRFbU7o9uEZ70s/OJIHN5/UQVKrgt/Zve6x9yVChaRtHmvk7kF/SoRsheLIbeYoY8RI0rUn3Sx7Y7o/ib/u9dMAec0xGt0K6+yde0DUO/uH1KpjXd6WHRPjoMERld6xA1fWVRu7G+gXrEZA1dN5Jbs8ZWVYGF6IBw2A=,iv:r4eYeCDJOw40hK7cyIEbEW+Pq+VFgUOJr1ydkSyjaEg=,tag:ucFH1pNqAHg7eWm1tYYi/g==,type:str]
 sops_unencrypted_suffix=_unencrypted
--- a/secrets/imxyy-nix-hashed-password.txt
+++ b/secrets/imxyy-nix-hashed-password.txt
@@ -4,11 +4,15 @@
 		"age": [
 			{
 				"recipient": "age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJVXdjRGN5MU0vb0VoK3p6\nUnBZSWNJYkZEM0plZDM3NFdPcGtKV0ZWaGlZCmNVcXRhSXJqY3BUYjdhMUhaQUtU\nYUxjNlY4RFdrd1FwTldLM2xUZ0ZtOGcKLS0tIGx1TlVXYjQ4UVQ5K2hvV1RKaUtG\nZ1AyelhjanI5bFF1d0tLdFRLQmdaLzgKCom4ycxuvZfTjPVwyJDUAHBUf2tEXNHT\nwyehXEA/4t3JRZc1J/uKZWIpsrIkJ7+ObfNMGgjK8aEXhmzaVXGQKw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArMHcvNXJ0VDdPWjBKVWwv\nSWlIZDlGd29tNWV0YjViQzNFSmx2NktoSHpNCjV2N3BMS2haQXoxTWtaaGFJUHRh\nZ1hHaUs3bm9GQThPajBNZUdzczgzSmcKLS0tIEpFTUxaK1V0cTFHWkNSazRuWmpS\nVWxhQk1xQUlZYXRabGo2K0RkQWpMVkEKABEUlPWwcBRlULAumFmiISy0OMBc2bFx\nIKXuPeWuj2HGHXHqapjnfQjtCALfSJ7C3Z4EIZPSQGJfllhIbqqP1w==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwbHhUUFplTDhsck56SjB1\nMmxIRHFZWERpWmxIaU51VlRvenFZMlJHQzJvClU5UFFTTVhtZjYxT0Q2amlUaDBz\nTU9mLzI3aTVRNFJ1NEdmL1lIS1hEQ1kKLS0tIFc3bzNHN1dPQjJodEx5bHNPS3RH\neU1pdk51UjV0aEVsazhNNGtCYmlHQkEKdr18o6/f7NGLy5ge8hjzZ4rk71pWhs2c\nAv02eyNNV/d0ZSgqg1xp1uZUyU6u6Gflog/klgLbeGtuUz0EWqnZFw==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVN1JDSHowV1JpYnpIRWRR\nYlFIdXN6RWZxeFYyRkUzRUtDS245TnpoWm1RCkJMU21ZdjVWYlNrRHlLQmxyUXU0\naDQ3Vnhaenkwd2VPcTBibEdpZTBaalkKLS0tIG5nbnpPYStKYnhMS01ZY2IwYjdt\nN2c4UkRYZi9QRkc3QWtjZ3JHcDFRRjgKVUS1oL0BG61RMbKlGVP6GXpQqEHk8JUS\nrcOUlmHK/WlCiuhQLxMZ6i8ha0cEjodxOIT+I/S9kZ9JMeCbsCxIVA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZRmpCRkZJNDYrZWp4dlJ6\nanY4cGp0cWduRWh6Smt2bCtCYXVKMGMrcFh3CmlNWW5YUGwrRjZHY2g3V0lwS011\nejRZbUVTMWlXVFU0aGpGUzJwZUdhbTAKLS0tIG85ZFBGRko1cm9WQVlXYWxBaENK\nT1d1ZVNMMGpBVkJwQnIxL1pjcWZFbDAKxfLrKO1Pf0RuomXbrG0RAOtPvPX+uqwf\ngnhIZMdjtOClZJBybCjqYbtpG3eOcmteTfc2MbWPbCHSSn0XaTsONw==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2025-04-13T06:45:42Z",
--- a/secrets/imxyy-nix-server-hashed-password.txt
+++ b/secrets/imxyy-nix-server-hashed-password.txt
@@ -4,11 +4,15 @@
 		"age": [
 			{
 				"recipient": "age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNeFkxSFVvSytmUWVCVWl4\ncC9lcHc1ak5tTm5wMHUrSVZvUWN4ZXl4UkJVClA5WGl0MzhjY3kxNnJWV2NSQ1Bv\nc2xFK2w2R0FQdE8wbVVpN2Z2TXRxTDQKLS0tIDZmN1VJUDhJSks5VHFwdVVXMmFD\nd3RWeks5bXo4a3BMWXdWazR5UmtDV3cKMKLuxkAtMKSak9ELgJj+tjZiqCkFu4J/\nbok89bqSV5/eC+hw2yTjFf8ArgPtDfqMgyeQ8wqBQiPgDScU14LI5Q==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnL1VzM1VzQktoUjhHenBr\ncmhPWFZlY3QzdlF2VHk5S1grNWVQVm40blZzCjhyTHdZK2dlRG9QWFVhVk9BR0pz\nZ05HTVpjT1lSVytscElIc0hJRDR6RWMKLS0tIFZXQ3FkenFaSFRpQThuY1pJUnJv\ncHFNS2RBZXU5WUZxSXRhWXY4WVJCSkEKr9EopWO5YFcOU4qc1aUD169bmNfS081g\noAc44CicASRERMI5yam0oe1Yf34UcaxDC523KpL8u95KordQjIuM3g==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4b3lzUDUrQnpXUHdEa01Y\nMWd0Q0VmcFpSS1Y1Rno5TFVTUWlIdmpCeFJRCmgyYVhPQ3MzeVlnN0VOaEloVTNV\neGRlRUVmOENxVHJkSXJJckFTWFR5UTAKLS0tIEpJSTRqV2hiRkw2SE0reTgzTzFa\ncUZRWkczTGttZ05BcitxdldueGNtOUEKLeDCU1sP657TX5QRQJucTDRZnIIgb/wo\nzhOYehzTKmKj5m5hOjlrIC6dt7G30J+JTkhiyxP6Invd+5dDjuabeA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBob0FzdWd0NVZZb0hQaHJ6\namg4czZlaWFLbWtPazU4SlFDalVVR1ZWSHdjCk1UNlN0SnVHbXg1UFR6dkJBeUk2\nQ2lLK1JDSk9lZFZsSnVWUGZCaVFqVWcKLS0tIFJCMHNxSjB4dHZYd29JbUFKdWdF\nNHFFeVR3aDcvakFyeGZVZExsYnVYaHMKQ0QV6FE02y88GT86iV7NrSsRa2jMlunF\nkcnyWs37l2tXQGs6ZIJbFTmsZIfPq/tyzPJr4QAYJ2gNQEsOtrmFfw==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlOWFJR3FEYlFLSXhjb0Vy\nSFp0UHNSc3lyVUQ0NVFzdlZYVkNIdnc4dTNJCmJiNUJadmI5Rk95S0xyczBLN3kz\nNXYrVC8xL3FXaUg3VDNCeklCN3hJbTAKLS0tIE9KaWt0U08xK1oxb1Z5R002ZHAw\ndngrZkhHellLZnpvTjVRSjRLWDB1cWMKmNTa1IBTokFR5zK775Rxi8C4p91sYxMA\n1XatIMnGuxPb/qTvzuF4pzxZ5NPbxD3F7vWe13FEs5rkqeMqaAgJoQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2025-04-13T06:45:59Z",
--- a/secrets/mihomo.yaml
+++ b/secrets/mihomo.yaml
@@ -98,20 +98,29 @@ sops:
        - recipient: age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWQXJ6NEtxcVdJMVpNdFFR
-            ZzNzUkxCbVVHdXM2N1pMcTdVNmkwajg5TGxzCk1oVnB1ZXhORS9GWlFIVE84Mmlr
-            bDBHUGp1MkM1dkQ5d053YlRRaXFsZjgKLS0tIG10VnRtS0F1bmduQmIwMEcvQ1pm
-            Ry9hVGpwaEFVZTFSSnBEN2ZHTzdzT1UKcHlNVcfl2Mbyje3ITxzDKGGmsnik+MoY
-            Vs/Xo4kkYOHdzuZfsPsrxMC/TkGfTwya0taoLz4ktNd6AqlBwfn2uQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxbXV1ZVNHOGVNMmdtYUkz
+            S1RwUS84am1BTlJHWnVqSzl3T253Qm9KYlZVCnFXek5nSEZYaXh0WkxoTjhCQ0xL
+            Nm9MR1JXdkdFQk1lVExhVnAxaDhRSlEKLS0tIGZJa2pDOVJKdTBRYTVld25wN1pk
+            VkN3L2dzMFRZY2RrV2x4STZiUStyeUEKsjyke3TVQWLdt99zgKRRPK98NSBFZYkO
+            MNCuSyMZu1ZEG/N/6zLmvEnQ+Y/4ofBSC7OudFmxZWAsfJqU0QOYCA==
            -----END AGE ENCRYPTED FILE-----
        - recipient: age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6
          enc: |
            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEdGxreUx5em9sTkt2Z2NY
-            eEFkYUcraVVwT0FXaWs5Q0dwL0I5V3V1UEdNClNiTlF2MjJYMHhQcE04NHluNmxC
-            ZTY4MDZtUlM4RWNXVTh0RlJGVlZDQmsKLS0tIGlnT002aWh5eW5ROW5HQ1pnZ2lN
-            cW9pK3k0YW5TQ3Q5eFRPU1NJRUcreEkKFNyc3hp+2U+/w5KU7kL7D7xkwIpdoT8F
-            m3mv7/2Jq0rr6c0w4aRdmms/6lD/gWbA5ae2o+AHPUDjyaLAtDVeeQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvN0hMaHB6ZTQzd3dVR2Vq
+            TzNETnk3clRBTnhiUko5TC9DblJjOTMvNGxFClNxdEtGNGoweTFnNXdrZGtGNHN2
+            YXZEYThqbFJHV3lGSW13L2V4aHU1TVEKLS0tIHQ4M1BQbXhxcjR2WFR4S0gvRTZt
+            dTdLckRTYlBvbjNMNzZ4cCtFL3lPTkkK7eCNJX1WkBzOCQK6zWmhbYHkdCoTtVhL
+            ZvxdCNOaSit/v7yWwlXVavXEtlOK2a+8LcdLoZgp7YgEy4dyr0s31w==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFS3BPK2JrUU84NjlrNzNq
+            V2kzVm5NU3JSUXlYT3hvK1BUUit0VlArYkVBClNVcUtnS25Ib2EyT0xZVUZNckV0
+            bVpDV0RYR1VLRGppQUVyTG51aDBudkkKLS0tIGhWdDA5Wmd4QXlvMGdKKzlTbzMy
+            SG5UYTRhVktVd200U2p0emNNNm40eVUKKUpCDl0oOkyrMsM4tTYXqnN8UMwPehqB
+            Xt04S5YyETUYm40RVNJ/5hwMa4akZNOITvJwQwrzZK1vI42lEN0EYw==
            -----END AGE ENCRYPTED FILE-----
    lastmodified: "2025-04-12T10:27:08Z"
    mac: ENC[AES256_GCM,data:7FgE9wuRKFPNCXD+g+38mMSizBWwIoLyhEO9uIm4zz2mt9xKgECA3P+IBR0tYa7DmPl8SYNm9visBSZCX9GZX0TfhAA001c1ees6gdhR9NvqvNSboyrXa7FMIyWREsDavMigIrSfBhsfHG/4s1Q/QwE72xntMKYTtjAnmP59/M4=,iv:50g6MyVcWeT38Wr+E9xj9OU8WGku3ThPTgD7W7g953s=,tag:1+nliqmuacDog5p4M3nBbQ==,type:str]
--- a/secrets/minio.env
+++ b/secrets/minio.env
@@ -1,9 +1,11 @@
 MINIO_ROOT_USER=ENC[AES256_GCM,data:sBnNpnA=,iv:Z2K8Cg/4DW+MxcKIFVMRWlFj2/qqFLCDnzJF6Uq8eLE=,tag:Y+A/FZm/3k35+bNgl89xPQ==,type:str]
 MINIO_ROOT_PASSWORD=ENC[AES256_GCM,data:sgYwUxp2Ao6nlUJ8RE7V9Bz1ZG4=,iv:LJJg62vCiguOp8aHCSYOTMtW3vjvXy+RnwghKJmaTR4=,tag:TnyxLzshfe53e2vav1QblQ==,type:str]
-sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOOWdNNC9UWXpvNHFFdm5G\nUU5jUmZFRU8rMlhqMGw5RnR1cE5wMm5OS0hJCndBcjRlN0xuWDA4dGdLYVhaemFV\nZ3ppZzE0REtQcG1oU0VQdm42aHlFc0EKLS0tIDAvNlp1RkhUZ2ZFSFJxazJ1emJD\nclJJMmt3RTA0eEU0OTN0RmRYQkVFY0EKbE7ybooQJuwoZ3Ba0ZHDvN4FCNvZi3bt\nFidoXkuUNQ1y96PmFvsJ0mOqfDcDQsXo66nFgQEuiEQl8OU2l1uxfw==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3UDJQT1RyNVpKMCs1eTc1\nUTh4UXR1dnowZmpHaGRhNUVHSU5qZ2lkNlZNClgxZWc4c1pwaEl0WEUxZzQ4bzZR\najJNUldHWEgwR3RhNnZ1WDY3NWd2YjQKLS0tIFJjTzZKK25wd1JFRW5XM0phNjZz\nUExNQ2JtaEw4TUZROTRpS3ZwWTN3WVkKA1sHQG0uPNQ9TXZ9+MKH0y/V+jIe1eB0\nnLoAaEASpWeh13hF5JepWBnUBtcI77n1otuuKAOo6EEPc72GvMZf9A==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_0__map_recipient=age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns
-sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkdVc5UkxWcnZ6L2dJNFRr\nbUtYdDE3VHprWXRTLzBUQzdoK1RaUGlEOUc0CmJ5RXhKTzhzaVhra3dublc5c0ts\nQlJaRS81QTQ4b3JPeHN0cEk4MW5XNEEKLS0tIDFnKzJGeXZTdWYwMlN1UVYyWUdZ\nTTd1WGx6QkxuRXVta3pLM0poSE9JcjAK4Jo1gCs14ynajOKQI3xpO6pnMkM0eXuB\nq6cOyk7crjC5qoOKi+2N4Yoh9X1edZn4LbfFs/yXFaPftIuZqBiXzw==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCQjdSdE1aSGlxYVVodmVn\nTElVSXZUeUwyaUFLZ1M0bitnUUVNa0k4cFFnCnZZTDM3ZzZFa3FWS0djTStPQmVo\nMnNpeW5IRWV2aW9BYWxKQ000cGZ3dWcKLS0tIDBqSnlkTzJOMXVQMkFqbWtBdkxp\nazgxVCtTQ3dhQkpNblJManQxcmpTNU0Kv/HR8NCDJM6bBHT6ZXAcKs7cdIQijrl9\nY96jG8Hc4yEG5zgv+t+Rm4V8oQ1tYtcxYCj0m8nXloC2krJj9Okx0A==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_1__map_recipient=age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6
+sops_age__list_2__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2dXVDS1U5Z1JWa3dmclhp\nazFaYXVUR09zdDk0WWwvdGU0UHlJVFBmc0U4CitraU9xUU14d0dKOVdVRXlSQVBY\nZXR5Q3kzYllPeWptVlJZcUxCZFFvMDAKLS0tIHdqMFVXQVdFTEY1R0pKclhHTjl1\nb21CMld5WWVZMU5zSHFpYU9wczNYVGMKzDrUnWCR5bMG/1BsmfN0cnoHFulp0HHE\nBa9oBq2M7yqyS74xttjf68lPyF9tC4gIRrTgx80DR78tEsJIfTaW3Q==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_2__map_recipient=age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8
 sops_lastmodified=2025-03-09T02:24:31Z
 sops_mac=ENC[AES256_GCM,data:ium37/C2+zybZDnSlhr6RmB3RiGmjVx4BbHXsfdZ6T+5/DFtkvduhuu0QxLReVBIZ/yYJgttTJq4wIqbUWMvsy2OafCB2piqISe0FAk2KfcM8kqfKFbLFghjkn6Nu1l331MKt/PMLy47ilS5i0Sh3QyD28/pe/tw4vpF3Vz8VjQ=,iv:vLoax3u4RCsisoSUIxy0EA+d2P/WfcPxfXM27QqmVpU=,tag:oCiXH1E9a9NBNbUikNvuBg==,type:str]
 sops_unencrypted_suffix=_unencrypted
--- a/secrets/sing-box-outbounds.json.txt
+++ b/secrets/sing-box-outbounds.json.txt
@@ -1,24 +1,23 @@
 {
 	"data": "ENC[AES256_GCM,data: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,iv:Nihe/dyJnoYjWfwktmMYLzJ5iWnv31R+Qg77Kgw8CCw=,tag:gFPT7ClRs+qDqUSABU1O5A==,type:str]",
 	"sops": {
-		"kms": null,
-		"gcp_kms": null,
-		"azure_kv": null,
-		"hc_vault": null,
 		"age": [
 			{
 				"recipient": "age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPbTEvNmtma2dTV056cEtG\nWTJVaGp2cHd1ZHNkbk56NFhkODVDaW1jZEVZClR0bmR4N0JHWUFiR3hvS2xBa2M1\nU0JzTCtSM1BWN3huRjEvdEJ5djFwNXMKLS0tIHRCVHlIc1JDVFNXZkwxYldlVGgv\naE1QZXY3RmduTTE3NSthMG9ycTdXYnMKf3EQM56fWrPiNWpcirBoRy9UyLj0+IwH\nN66t7u/7wk0cSkHnngtnwEpiBRdpZ8/pseXTOzjq7F1rsV3cdWfUkA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEYXFjMGlKR2dtUnpqUkJ2\nSVV5YjVjS2EvM2NRSy9GM1dZT0VESGI3VVNRCmpjK3V5TzJJd2Q1S1FTbGxSTUR2\nVzRsTWVVNVJZbnJLUHdjQ3dsS0dLRU0KLS0tIFZ1aVpzVmR4NUcyQnNBcitORFRo\nSGttenMweEdPTDdYNWFRQUdJUE5XTzQKVrmyY//3sDpXBnYQcriuScA5gcvt+2eR\nSGWDqYU3sYPYl2OrhkfMkit9uuRUbo6oBzd565V8XKVVWGAyBYCWJw==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
 				"recipient": "age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3TWJEcVNRSnpFclh0bVFk\nQXowbjNuN3dRUkppcXNUUWxuSzVHaXUvK2dVCnUwajFrVzBEVmNxSGJXQzkwazVL\nWDQ2UVNDb01SWkdvRUJJRUVUSno4ZDgKLS0tIGhIdjM0SjNkSDF4WGFub3ZyZ1A1\nZ3lOd3h4MXUxaGVLTVJraTVNdTltemsKlahWtratvptTrthjBniZFPZxqPDjfchF\nc7Sa9X6XtY/4G5BIMnmUWURdYgGJf4BydqyyeOgAdE+Cpke9SKRdhA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZSGNycFk0cW1hMElJSlFO\nWmhwWGRsVGRmM2o2b3g4ZmVENEpYc3BYa2xvClk1RGVkNWpMK0tYRW0rYkpJajBG\nVmp3QndlcDJhemg4UHQ2NG55dTlELzAKLS0tIHhzWDdpVTRUUWlUaEEzYWtKSmVn\nSCs0SEVMQzJVTWJjeUs4ZmFqYlpjY0kKIUnM26SWsmAXpbvqK2q+6U9gYBafhpT4\nT48XVW2Q+Tzouk0qqMAM9vcdZcEvvuG1SMQu/2uIjpYC/wKq+FK7AA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2WVpqbXZYWGpRbzBudkFr\nc054TFBmL2xTK2dyNjNkTWFoaHN3UHMzZlNnCi9vQTlhWWo2UmFCSDlBd2RYSTZE\nNDM1dUZUY3JMbjdGNHF3SkMzcHVDUkkKLS0tIHZCRkw4TnZEYlhuZGRpbnhaUExi\nYndyVnhUQnlxV2hWVHJXb1NJalBiTmsK0Gp4xuXhxb4buogNxDyu2E5ne6dywIal\nAD7FwpAE0xwOgMlZ8Aw8iQh+V8bEkN9LpGpPHqukoeWuUVDMeiXMAQ==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2025-03-29T14:41:58Z",
 		"mac": "ENC[AES256_GCM,data:xXGXtzSUKY5kMh3zEuXTuzP8POn5JJhjRozaeI91SgpMFMJxJ0fAFV5Ez3F1XOnn0sg2Tstk6f5Fcv/7x0xrgtVBxfYSPWL7tuqWTvMmD53apenrj0JNh+Dojr80FyTTl7PQuA6t5flrwt+KR09HlIm2vFOqwqXJSekaZa9y9XA=,iv:oEfEMCpMY50ArLvve3vJxupmvWTQsX2+iOQqEpFD1yc=,tag:PTlO1mP512FBxakIZjxBsA==,type:str]",
-		"pgp": null,
 		"unencrypted_suffix": "_unencrypted",
 		"version": "3.9.4"
 	}
-}
+}
--- a/secrets/siyuan.env
+++ b/secrets/siyuan.env
@@ -1,8 +1,10 @@
 SIYUAN_ACCESS_AUTH_CODE=ENC[AES256_GCM,data:/8/nxcZ6Yo8eqOeGoAAXLzcZ,iv:bjBBXR2/vQnN4aT+vxgzOHayyJkbi8bgvGIHjGiwaAI=,tag:1FrcJ+q2Z69lvfnZlSyRlg==,type:str]
-sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0eUNaSWdtSWlkZTQyZklT\nM3IrNUZ3U2RPc2ljQWxvcFc2SERrRXIyNlFVCnlGeVlrVmJ5eVNqM3owZWM0Qm41\nbnRMeXFKc25uNW5tcVNIaDZ4UjZRUDQKLS0tIFN5MzFYVUUyNHVWUmlkcWhCZkJX\nUEVKYklzTDA0bUdRVzlsZXhKUUNHWWsKubaXhMRekUJfBroTtdnDF6++RIVAz9B2\nAO0bU69lp5yq4mrkoZ/Y9Wvlcx158Qh3CjS08rU76cY77gwanqNuBg==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4WWd6YmFMcnBUc29oZ1JR\naDNMQ1o2Mkx0aHN3ekZtSUZnQXdJU1lCWnpZCnAwYkFxempmMVBCc3pqY1Q4cFFu\nM01UVjVnMWcwNU9QOEVzQ3FpR2F6MUkKLS0tIGdQazBGNVY0azFJRmw2YTZLbHh5\nR3lBYWM4TjN2aUptTXpFNng4cHFpTk0KA4pmhKWwXkMVzixe+n6nAFDgGmLFOVBM\nB45S9A5yJDcBeuAOai+Jjt3DupzWMkfJ2rRDbi6wCRb4hjcROnV0kw==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_0__map_recipient=age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns
-sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQQUtIcnR4aXZiUEZQcUFB\nUEorSjdNZzhBK3krdzFTRGhZcXBndXZxbUJnCjJtZDRwM1c5RzA4bWVzcGZNK1NL\ndDJGWjNwSE1ONHNwdEZWQktrdWVsdjAKLS0tIDl2TDVnc0VuMFZvdmRxam9JcC9l\nSHJENDNrOURHczh5ZzNHUWtuQi9QdTgK5xRi5CcfEl5ADFcWPtLUwDZ5jm1aEcNh\nCnR3l7drUkxmKl2ZBHKPcrxZMf0qauhBFFXVZhi8ruZ8mbDF/eoEzg==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCY0hjSGp6Z28yTXhscERF\nKzdHazB1TW16MU0xODdwcnI0OWhRTmpENTJnCjh0ZVFsbDhWdDBUdjVXQUttNXNP\nSnpsUHV0cXhxSUJwZnRlS2xPaWI1RUkKLS0tIHJnaEhFZldkOVhxZnRnMnZJUkFk\nUzNBd1ZBRmNRa1JMUkFUb242Sm03eW8KyDOJBjNMcLferank0fO04GRoR9T3pggr\nouBf6CMTTpXfXSvkRw19/V5jrdGHMOsXq//JJYfN1/Ah1ItmYj7yiQ==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_1__map_recipient=age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6
+sops_age__list_2__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEVWkyYVhtR0dtR21GSjNr\nODBVSVZ2SlFWMkE4d3hkdExETXZXcDA1eEdNCkMxNTRUN1BYTTFQa0dyNUxBKytw\nNVdyQ0dxTFF4S3V1SzZFRGlHZXM5M1kKLS0tIG4yQW55bXFGWk4xRW04dW1sWkpD\nazZYRzFDdk94MFc2b1JBbEY4YWF1OG8KzRUDpaQzju3wDfWt3yKU9V7DA12VMkan\nLXtaCuRglojlT9pQ/rOF83APQyXZ57sUrVFLTAgMFD7GqLgrmJR9TQ==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_2__map_recipient=age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8
 sops_lastmodified=2025-03-08T15:05:21Z
 sops_mac=ENC[AES256_GCM,data:9AEY6o2bHCgPqvxSwwf+5K7Cdj7jV14BdnhoA+k8YeW/kD6j/F99a2YiTP5MivnDwUH7Jm1PmdB2F2UKcMgmExUmcqTnAodTlZ+5IZnNENvCRsIbtF8QbHwDsbduRvLhrITfOT68Axug+/T9c46SDKw9608FD7zAC/3XILZXqnM=,iv:qpwGAv6aXTnMW4l4kuuGeOogtRQqhywzOigP/1RaviM=,tag:hQXuLGNBgMhBchqdMlRm7w==,type:str]
 sops_unencrypted_suffix=_unencrypted
--- a/secrets/vaultwarden.env
+++ b/secrets/vaultwarden.env
@@ -1,9 +1,11 @@
 ADMIN_TOKEN=ENC[AES256_GCM,data:w1d4chazl81k15vMjKn14ADXjxgNyxs3D4W7tXJPebrcULzXw+0=,iv:l/sujGySuvcmOh1UgL8Tpg4ENLFIlKhhhAh1xRwx+5c=,tag:IAfeV/SCzehr/URjRoyzmg==,type:str]
 DATABASE_URL=ENC[AES256_GCM,data:T39yeAxPOcnoKGO6OAJ+g3cr8AZywKsTDAhJnOhc4SQMcvx0HMVJpUAn6yA4yOlAAH//kKAY5uXHqKpig9c=,iv:ONoUo52LcBZmj+wYdZYofGPeS2GtKfhlrj8IQE77VrQ=,tag:u09irmLyYcU2kHRBOp5aBA==,type:str]
-sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQR1V5YjN1S3RJSDN4R1Nv\nbmttQStJc2Fha2NFaFlHZUpyY1RvY0JHUG04Ci96eU9PbUxod01FQzBLQ0QwalFk\nWDVBL1pJV3BxSGJHTjRGRWk3U01aZFUKLS0tIDQ4YWNISU4rc0VqNzdtZHJHbk1Y\nUnlUaG92dmpCdWZMd1VYWTRtT0x5VHcKeEPLOmU6ER0Cvp1OpWb+BEfq1FC1Mv6Y\ntzuUZP6o/4tocNv6iQjr+xjW0X5pAzATUhkumhaAMryT6tCCMWu3ig==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHVmdISmpwWE85ZTZIdWlD\nNDN3dmhDWVBwVUVRQllEZjdPZ3R6UXZ1NGd3Ci9wWlRleFY4c1N2bERFWnNaRFox\nS1gvSmZCVlFzNmFZZWRnVHhQaVNoMW8KLS0tIG5HUVh5UktWRlhxTjAxSW1QZWhH\nZ0p4TGJtNFZldzNZYjFTa1ZvYjFnRXcKOQecMvMu6n/ZiaytHnHxxI3Bo0S6DQTj\nyydUrtEFJ0JMdDnAtb6c91wSjMAcWQ5EEL1jpmsc8z1xs9oDHy/WIg==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_0__map_recipient=age1jf5pg2x6ta8amj40xdy0stvcvrdlkwc2nrwtmkpymu0qclk0eg5qmm9kns
-sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0Y3hFRndPc0VyK0dtWWFi\naVRBb01TdVVPQzErT2ExM0VFYitPWlR4OURNCkQ0TlJUYVpzWlZrMjZTM09uRWsy\nTGZiUGlGdEFRMTNuTnBHelZTeGQ4MVEKLS0tIHM5ZGtHZ01pdzdpZ3crdlhrUnpX\nTXVBN0JNWlM5RTMwajhRWi90dTlJeEkKEZBRsr+hZ82/kDojREvPY5+ZNXDHCISu\nW6ICh4Fy7ljP1eKrIysGdUj62f7CoPFpb1HgQ7iyyX4i5eKqeY+uzA==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaeVY0cGJLR0g4ZEtEOVF1\nWUphcnJKMWloMGJnbmJyeXR2WDVXLy9zVTBFCnRJTG45cW45UnFNSXIxMEhsdk5u\nMmtHZmFZOXVWL3hPVndUZVViZHBZWncKLS0tICs1LzcxeFUxVTB3WUQ2M29WaDJT\nVmFsUWY3MUN2aXNtN0MzaE13VURnMmcKpnNlHV2Ac0CNp+qUxtGDB1OZYx0xQEq4\n5nnKB9EvVeDJdTO9arMMJKvui4nPeZmkIVLNRYyK+kaKTSxcueKVSw==\n-----END AGE ENCRYPTED FILE-----\n
 sops_age__list_1__map_recipient=age1hpgg6psejh4y6jcdd34wxuml75fnweqpe0kh8376yqsctsfn9qxs037kk6
+sops_age__list_2__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmMjcyOTFxeEdMZmgzWUJG\nV2s4L3F6Zk5DN09wNC9jaTJnYVovZ0FWY1RjCi9ubldRSjM0TkxURWNGVlFKRGll\nUGZURG5wUXhhckNOSHNuWmVEWWhCa1UKLS0tIDlVT29CbElTZng5M29KY0htODVD\naEJLV2RCTFJ0UUZXSE5nck9oSjRxZkEKJRu/m+VD8KVEq23PG+3uTYgnr+NkNaw9\nYwhjPPZzIeUHq0RO7SYqV9KF5Fb23YwETP7i4E0aOj44nWH/drzJqA==\n-----END AGE ENCRYPTED FILE-----\n
+sops_age__list_2__map_recipient=age1tp7th3rrv3x0l6jl76n0hjqjp223w2y586pkgr0hcjwdm254jd5shkj6a8
 sops_lastmodified=2025-03-02T03:51:32Z
 sops_mac=ENC[AES256_GCM,data:PDUG8KdcLG+U3FY+9qdo+EfMl3RXDdRKIguu/WHpOmgysCOwLwFXrzk1783czKFb/K9tPisIJGj0Luak9FI/4nYqE0RwfdShcw0aRQnjoWFPtNFS6YbRI8T8av2OKnvKGM4Xdmnv+ivaXpQar+reIeW9THXmKkVfmmZa01ZlJa8=,iv:t71dpAMC88KnF+EeR1ryf0UAfY4FEdxiUB8L2q1p5Tk=,tag:vwTFzv6IUEuBcZjym/eeFA==,type:str]
 sops_unencrypted_suffix=_unencrypted