Merge branch 'master' of ssh://git.imxyy.top:2222/imxyy1soope1/nixos-dotfiles

config/hosts/imxyy-nix-server/home.nix

@@ -1,20 +1,11 @@
-{ lib, ... }:
+{ ... }:
 {
-  my.home = {
-    programs.zsh = {
-      shellAliases = {
-        proxy_on = lib.mkForce "export http_proxy=http://127.0.0.1:7890 https_proxy=http://127.0.0.1:7890 all_proxy=socks://127.0.0.1:7891";
-      };
-      sessionVariables = {
-        no_proxy = "192.168.3.0/24";
-      };
-    };
-  };
   my = {
     cli.all.enable = true;
     coding.editor.neovim.enable = true;
     coding.misc.enable = true;
     coding.langs.lua.enable = true;
+    coding.langs.rust.enable = true;
     persist = {
       enable = true;
       homeDirs = [

config/hosts/imxyy-nix-server/net.nix

@@ -172,7 +172,7 @@
     enable = true;
     role = "client";
     settings = {
-      serverAddr = "hk.imxyy.top";
+      serverAddr = "hk.vkvm.imxyy.top";
       serverPort = 7000;
       auth.token = "{{ .Envs.FRP_AUTH_TOKEN }}";
       proxies = [
@@ -466,31 +466,33 @@
         ];
       };
       ip_prefixes = "100.64.0.0/10";
-      derp.paths = [
+      /*
-        (toString (
+        derp.paths = [
-          pkgs.writeText "derp.yaml" ''
+          (toString (
-            regions:
+            pkgs.writeText "derp.yaml" ''
-              900:
+              regions:
-                regionid: 900
+                900:
-                regioncode: custom-tok
+                  regionid: 900
-                regionname: imxyy_soope_ Tokyo
+                  regioncode: custom-tok
-                nodes:
+                  regionname: imxyy_soope_ Tokyo
-                  - name: 900a
+                  nodes:
-                    regionid: 900
+                    - name: 900a
-                    hostname: vkvm.imxyy.top
+                      regionid: 900
-              # 901:
+                      hostname: vkvm.imxyy.top
-              #   regionid: 901
+                # 901:
-              #   regioncode: custom-cn
+                #   regionid: 901
-              #   regionname: imxyy_soope_ Hu Bei
+                #   regioncode: custom-cn
-              #   nodes:
+                #   regionname: imxyy_soope_ Hu Bei
-              #     - name: 901a
+                #   nodes:
-              #       regionid: 901
+                #     - name: 901a
-              #       hostname: ry.imxyy.top
+                #       regionid: 901
-              #       derpport: 1443
+                #       hostname: ry.imxyy.top
-          ''
+                #       derpport: 1443
-        ))
+            ''
-      ];
+          ))
-      derp.urls = lib.mkForce [ ];
+        ];
+      */
+      # derp.urls = lib.mkForce [ ];
 
       oidc = {
         only_start_if_oidc_is_available = true;
@@ -626,10 +628,15 @@
         "vault"
         "coder"
         "headscale"
+        "grafana"
+        "matrix"
+        "note"
         "oidc"
         "mc"
         "music"
         "ai"
+        "sy"
+        "minio"
       ];
     in
     {

secrets/et-imxyy-nix-server.toml

@@ -1,5 +1,5 @@
 {
-	"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]",
+	"data": "ENC[AES256_GCM,data:NTD/oO1/t8NCDkesfvScz6GfcwNKtEqtZa5TPlqbYNsicGNiM6P/hj37TbzqWkVJNB7asGkdfr9tkHZp2wgbjqciAo2Im+tylRWlRPS9rvqg07TyN7PVypMS7dhtERLwhyInCQb/iYI+Gljon+D/iavOdvdROyzrmwBwwDaE9eGlxszo2CPlZ4IUkU/4BD0t7zbMQKafNM//gDTXnneT58zMA8H4aep02OCnyCZKycLuM3GbiQfDodd6r+2ihiF/UEj1x8H7pUX+B1HkAFadZqLsNjOVB4Hh2boR17c8/2VY6T11KvAqg1yFVra6uTvyS9kznmkhGYtCI6OwCidxuMflMtA5YpgFj0BlGzU6v4l/tVy6vfI4tw+q7IVmOgsFxODSkpOpYZXilWjCwicslJ+ao6rBJpX2QuLqy6nU+aLxK3vWJZLEyfYeecM+Hi3eWNZ9kQ5Gd7zMxC7/zFRTspoeFxbC+KB8gYsKUDWz0HbXmg/pWqCRObaz8x/soi3Kc7BDlwAyMohKU0K0bCNtVeGE4hn5+xn5zxXGV4MPrvMuFCc7csJ/FLAm/YEzZiQIvC1LpAmms2r5uqzqlflJ/rjx/SZyLs3HRJ1mGKPDorD2Jm9hl0vyMO5uwbO1iPLtUykfOkfw1uGPucNn7Ig4uzjIqSn1Sd3V87Tdw3ex1MIKP/XKwFfzCzpAU58ONAyXzAT+uytPQYy2YeDZZINi5urXg3Pk9sJimGmlXMoscZgSA3rOxVnr6WeIID4fTU34Yrl/iV/ehYeZZ8dYIGMhapIXmbe3cE/ng+5lvluhLRzzah0tsWPJTL2zsU5qj4uxsxLMxMRGdWiwxA==,iv:zBsQCcPxoRtZ3PTyP8XCz2RgF+4KNb+YO5bD4MTr0lw=,tag:j77MuHDxO2QrhlOko71iIQ==,type:str]",
 	"sops": {
 		"age": [
 			{
@@ -15,9 +15,9 @@
 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjdGg3QS93dHd1N3ZmMUpl\nVSt1NWplR0RoVEpTRTFMNDdxbVloclJUR0NjClgzalltamFtV0lYUHI5bUdpb1N1\nY0Y2NkxNRnVVMkJpNHZVdCtFdUdYRlkKLS0tIE1CNVYwbFFDUVJsRVFZR2c3cndU\nNTJncVZ2NkdXRnhKR1ZSdGcrWXVrK28K9pUGqIy3hT7VZ5JRcLaAZtGG1VxEPOlG\npDcrDoTRmZjAtaTLXu4bgQTUQaDa3iRWlm9gfRzAa7jSlu3M3OTcOw==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-03-02T03:25:42Z",
+		"lastmodified": "2025-05-28T10:44:26Z",
-		"mac": "ENC[AES256_GCM,data:nfLHwjKLtiabq6qEhnFENrwPIH5Aehyng8Nkl4IuBc18fjSEmFkktS5U2lJaAUPNCvLoSA69icGTRk75EflyHXGx0w1j+EwTWD3/OrNxyEr6z4gSLNxJkGRjMJjuILhkxJ+UU6X7rCqEjMCuvUz8IjGL3llPBnRTUb6s9ynIGCo=,iv:TspuM0wfklVl/yTsv+/iVPNsT+AuJ1gJe3nLia5cD+8=,tag:nt+ZJZfjWzlaByOxv5944A==,type:str]",
+		"mac": "ENC[AES256_GCM,data:1kxJPbk4Fxh8CXBhukRVed10Nn/YbWjKHrsQhVYA5SjjCEpVO2J8Yb3j9Kc9nhhIHjat/IpLLHlbFscsJ3QP3u4p5cG6P/cfYMyz0LOInwDr8dJl6DJ1tkaeociZp7TFbgeIgyyUH2KNJemD0vTgQuoLI6z3ktrBvH5/LP5CkAA=,iv:7SEBswkWBygTeOOx3LXMTMiH8LpJNhHIdpZBpfiq6Gs=,tag:M8rEJTm8A7aTKJXhOz2t2Q==,type:str]",
 		"unencrypted_suffix": "_unencrypted",
-		"version": "3.9.4"
+		"version": "3.10.2"
 	}
 }

secrets/et-imxyy-nix.toml

@@ -1,5 +1,5 @@
 {
-	"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]",
+	"data": "ENC[AES256_GCM,data:eB0RdiZUWK5q56R12B9wn/NK8qhA31YUbVsVDO0/xVj6kF+Z6QQySUX5WOwPI2D9dkuKiYniEbhnsXVbjt0h/fsWC5OSHcj4KC7WrpbMuXiwWbTMkOsjPASGNqCUFM/Hl+wTlC6sCF3IGZ/OHEtqu1i+34S3j+FcE7zvRjVe3bs+XkYS8yQeqBwOdDhqpLmsWBCEu71i1/pTMMp3jigoKEewgUyxdDgXVkb1fvVAvNey5gwjZM92fNr0qAKxCzGAjMhMmL2mS+fuRoTJAC0VwJu8ytyp6g6zsYHD/5paZoQ31pzykS9EHvjY7qcRJhOKR9uB6rbdXQa8U8K0Jy4HhJX/nn74Z0CpoTcLImuhSAuc0Cv2+dONn8F43O8JIEDKpih3fi9f8RUNcO1nIlLVojbO8TOT7sGNJgTjCZ0wmZH/Q8keyJx+th0YOTqdN2E26xR+Ry/hoTtoqFBLk/Xsstn15z6cFAcPhEyrZFd7cidgIkl58FcoNiy/2MwY8p0p4cYqZW9ZhWBSzFfugo+e2zIl3EMH/hA3aK9GZTFaot0cvSQOm06S6z4vZZRpP+cJOpZBrkCgLc0vyDHe6biID+lk4SL6G32wctvAZjU/B939JE7B5NQFmmuKb8NyvczCEpTFgjdR2Rb1zHx8oLVlCSREPkj8jHZ7LS/4+wZAS8bPAbcWf8RMFiiq1ZDyubGIwqVWb0lQjviAV0H/mx1yvuPzUird5f8iB9qqyQ6FRBSbTOswIjVyqgtG1wCdGevRc7AecmfCiv4=,iv:K8ZgwiNzUzBFqsWp1YrX0MMLQd9t+mj81jpiZw+3duM=,tag:F3nEoIY1Aj6LFBWNsN1aRg==,type:str]",
 	"sops": {
 		"age": [
 			{
@@ -15,9 +15,9 @@
 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNWGZuUkwvVlZXNHpxQlFk\nWW9KWXpvMFp4aU02NWJ5N3NBUHBzT1ZTVWdZClJTZFV4ZCs3dVFWT2dtdkhKdVg1\nV1lwVi9vSStPdmI1ZURRbWFTbGRwbGcKLS0tIFFrQ3h2clY4a1hrdkVIb3l1ZUFO\nQnBrZnBUMDFGRFJyZ3orRDk3aDNOYVUKsRH9K4gONKykPLbI1Zw7gM6BtqLw0i2p\nZlRVuzTsu7K45n7NxvGejtBxklZcioIVYXQ5CMux9CFexUqEsKku7Q==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
-		"lastmodified": "2025-03-02T03:00:34Z",
+		"lastmodified": "2025-05-28T10:44:37Z",
-		"mac": "ENC[AES256_GCM,data:aRyMLpLOd+0lea0rvBsmUkB7TICyLERl0U1hYjadowIWhZsv5ZdrppAwpqljnqAcgnAVqMMLVnwsomSCJCuslLV2i5U/5uypIMzQR+8pFy5l1A4bibuUxqfFl/gQ9LtdqWnXg0QQgu2/KSVFvQnRN7/5QiOs2ELyeyIQi/KAQP0=,iv:DEqMTuabm+S7JuxxRD/T6AhJDn25MSDEaVsU4Q2to1o=,tag:gZ/+hGS0xyTuPySfF0Jtug==,type:str]",
+		"mac": "ENC[AES256_GCM,data:eLdxjaAPB5w56GXdyqV9fgxdzNvD/rp08T44dV4mTOfbd05GQH+35wcNUXLzfUmcH6NSQ5fhUQmthWGEXEXsZawJ31GJqXtzuBJ9ZJiID7yg+gwJAaUh3JcYWke00ke3M+2PZ7/JMydTU2v7I3zkh58pLSUcOO8yZ1L6/q4X96s=,iv:QyJvIh6PW65i8ZcJTvAJt+MShn/bNRuRsxsD0pcNQ0w=,tag:9RvBU32Sx0+pPcaAu0LXow==,type:str]",
 		"unencrypted_suffix": "_unencrypted",
-		"version": "3.9.4"
+		"version": "3.10.2"
 	}
 }

secrets/mihomo.yaml

@@ -10,69 +10,69 @@ external-controller-cors:
         - ENC[AES256_GCM,data:Ow==,iv:C2R4gooPGj4lranMXP6Uu+nCbGhVk1S37dBKbYgdsRU=,tag:onXhjT4c/qMoayForPKwEQ==,type:str]
     allow-private-network: ENC[AES256_GCM,data:mxDrog==,iv:L4hT2zLieK7nQnp5GvdHTsnSkeTz61v77nr281lAcag=,tag:jCQgs+0aDrl7BSZYxI7qUw==,type:bool]
 proxies:
-    - name: ENC[AES256_GCM,data:pQGaACaf,iv:bK1kKEgyHJYmDtWHj2S6j8cL7hEpnESjQ/8sRY6G6es=,tag:uPp6zJSybNvWgJvG86oPvQ==,type:str]
-      type: ENC[AES256_GCM,data:8+AmvsqSRHH4,iv:57lTFwNf0ONXc2oz2MDXCUFcowvGumUpMQD2TYvHlH8=,tag:KLPNDQ8W9b53gdIiCVEKRg==,type:str]
-      server: ENC[AES256_GCM,data:bNVo+H91vMIZcCKA,iv:eK//i47MM9OWmWoftn7Zy4zpXrnok79JTYryFHafRrU=,tag:amC+xL1uHMjvSIMNog7M9A==,type:str]
-      port: ENC[AES256_GCM,data:ixny,iv:NRPp+pUW0cf0b3BAHS/XtUvlsTg5V1HxJVADYlkNqig=,tag:3M1WgBTFiTg4R/9uft/zSA==,type:int]
-      ports: ENC[AES256_GCM,data:+3U9QYPG4AKOJjM=,iv:z4vHcfk1+rAVOGcglY+E+iyBYTOL1ci7GrhZn5Ncb5Q=,tag:doMqBjWKhwXclftNEFlZkw==,type:str]
-      password: ENC[AES256_GCM,data:t07Stcs90BGXiTn8w/CdZgXK3g==,iv:N6gNmJr+1EUWmdLknrL7tMEOlghbKMtN4ayn/3rpobo=,tag:Bii1waY1RPbZelSvVU+g2w==,type:str]
-      up: ENC[AES256_GCM,data:I3dQyGfeBNg=,iv:8XjU1MKwOg1uuOHOfVu8xcY8xZkyDLC3DsvCYCwFFJs=,tag:6V9KL5QeDfPgCNjAK/kgdA==,type:str]
-      down: ENC[AES256_GCM,data:kphfKaQrBVTK,iv:cQbLYAjgID9T2wi51vAhw/+oUFfu2BiGMqfqTEf2vbI=,tag:WGIMzBb8UcAEEKJHbOmeww==,type:str]
-      sni: ENC[AES256_GCM,data:N1XYBkWZHcokCAwNav0=,iv:wZMb9ufI15orsbjfWPpnR70jJ3AhUuI+9h9NnTzZr5E=,tag:N4vbN0+8QDe3yN5bit3F4w==,type:str]
-      skip-cert-verify: ENC[AES256_GCM,data:fD9uBNM=,iv:pvP1qVsK4I2ROB92Pv0Ed8byH7DMfR3EM6VdKwDnd6g=,tag:PWgu06W/JHIeI+OHNq9P4Q==,type:bool]
-      alpn:
-        - ENC[AES256_GCM,data:ndU=,iv:tFarTtgPNIYfy/N9AvBBB/fOr296amxj7Qa8VcjHLJ4=,tag:gIRrF/wnqfNlk1jDXazqZw==,type:str]
-    - name: ENC[AES256_GCM,data:gtGCyojeJWGc,iv:BKuY0sT5+/BTIscjY5/Pc3aoFywfzjeDlSXL5D/7v6k=,tag:GSn7HpLCj29LsJy7nJc5UA==,type:str]
-      type: ENC[AES256_GCM,data:UlGHyiA8,iv:upAc7GudOgPttF/4dhGmAYdzEP8+ZzRomV4JN15E2QE=,tag:5FEijyNGuuGeK4TRZVEg6A==,type:str]
-      server: ENC[AES256_GCM,data:eZFNt+Mf6da4CPxi,iv:u0Q/0Ls65Ivj+GtZ1P0BficN+nqjD98vF0NlUpwAZLg=,tag:xQ+OsGqXQJBRXJl2D+MG3Q==,type:str]
-      port: ENC[AES256_GCM,data:5E4+,iv:0WbTukVgJTBPX/ued9q3QOVpixpiqAca/C2NDFt67Jc=,tag:FmPrhBqt28u8aQceShZV/w==,type:int]
-      password: ENC[AES256_GCM,data:v930O72DIdvPT/0upp+VC8Q=,iv:pjxwmn8qGSC1KvjN5ylPaxm9S4jgKnEOqDiOm+FYQis=,tag:CoTfVWuVPcpTTaF5Ao63yg==,type:str]
-      sni: ENC[AES256_GCM,data:Sktawi48qWO8mt471QI=,iv:6PgDBNRFxvW0m/FTyGxkbnDiCMztWR3AKS0k6BxAmLY=,tag:oK7d8iQ58Hbah7cYjJMSyg==,type:str]
-      skip-cert-verify: ENC[AES256_GCM,data:RcrZX3s=,iv:4iPFYNYbcaW/j/R74F+QEeqEO3c6nH7bWnIoLIswuOI=,tag:fGNdK9AUQk5uiuKHVN4ZxA==,type:bool]
-      alpn:
-        - ENC[AES256_GCM,data:GZM=,iv:hqg4s+F1gz24LtsvIbdzFPXYrPUmSnAdLQAnoQs1u9M=,tag:XHjVFT9ZMcD3NnGdpkgi+Q==,type:str]
     - name: ENC[AES256_GCM,data:CoSf2ETY,iv:stqOA3auCgfdMF5dtHrxUtM1fmrjpBzF++Oq4CaaxDw=,tag:Ep8+Do2KSGyyI3htJMyO+Q==,type:str]
-      type: ENC[AES256_GCM,data:877YbphMkl2Y,iv:+cJj8y9Ka3ep1n6XhNwC6M2i16K9iS5wlygbow2UJ1w=,tag:upp5Zm1BsKQufd337VOYgw==,type:str]
-      server: ENC[AES256_GCM,data:mOElD+p3kc7ruxlj,iv:Eo3ov/rQWp85ZVa6xZDeWEoj4NJNWlFbVoaJhn5akCk=,tag:YQGlqfbF6NWfJw96Sm6tng==,type:str]
-      port: ENC[AES256_GCM,data:44XQ,iv:DEViWVfJp0vnsHkwVrRJs++ggL3AMoPDC8Yo6HhJ4sw=,tag:E9iWzUejhTZy8zKGepZyDg==,type:int]
-      ports: ENC[AES256_GCM,data:rMksYDt5l/YeYuc=,iv:+YptxhLuilsfEdGdqb+p6lLtCFaEIwKm34oLYdcIBAI=,tag:fMi0NDJr4bBILmjdZ1So+A==,type:str]
-      password: ENC[AES256_GCM,data:Ogt0q3YMVBDc0DRvHqYp2hsIOA==,iv:jd5YgMd2YhbqcLTEh6veJPJ/ai0tZORmzPN9qSLMFNs=,tag:FfuVqcU5KsHQvqo5I7OzPw==,type:str]
-      up: ENC[AES256_GCM,data:nMRroxyPEz4=,iv:KGsbO5+u10vTnlCgURiHB9zEakP9EPoWdhfnAmoWtXk=,tag:KyZGxpFroNRaQO+yeVFEhw==,type:str]
-      down: ENC[AES256_GCM,data:I1yX5yspLcq2,iv:HbzlrJo0ZdZHI9/CSBgXlwkX41R/buS8JeQjBem4yKg=,tag:lfuIiVFIlst3wGidiMsovA==,type:str]
-      sni: ENC[AES256_GCM,data:1gvAU3CPOGg3gw4z,iv:Y7zCLWIZ8/DR1ZY2IE91zcvadfj5PejHw1T8wANzfhY=,tag:JcLhVi6t6TEXCsY/YZgj/Q==,type:str]
-      skip-cert-verify: ENC[AES256_GCM,data:GcVZ3dU=,iv:d3DCIr2IC+qMSNLOY9+8cUoq8MdfqXcU1DG7paLax/A=,tag:qlIpBwhLmF5bGoVIyD4ntg==,type:bool]
-      alpn:
-        - ENC[AES256_GCM,data:nrY=,iv:Qz5nEor8miCh62x1zGt4iCjtUX3znyRolrrvx3c2suM=,tag:tC0goZP6J9gMS28+KhZiEw==,type:str]
-    - name: ENC[AES256_GCM,data:I/gOScJ4PYyG,iv:Wi3x1D25WX/m28FYenmU+g/laqosIHe0YpFQGYTIAAI=,tag:Vg/KqSIhxVetaloyeEp2FA==,type:str]
-      type: ENC[AES256_GCM,data:fhOmk50v,iv:FZMGVkmWXTXAXiihFugdRejKAPbSQx7MIzgh0QJGutA=,tag:4Kjq2vdiAnaWWmw9RNPTqg==,type:str]
-      server: ENC[AES256_GCM,data:fByASUq0i6vl00aT,iv:m7iykG0sJnyjBSuu9qD78bS918FD3fj9Gak0cBSidJw=,tag:U0y1WHvOmQ6f3qnz1Qs+Ag==,type:str]
-      port: ENC[AES256_GCM,data:rYzd,iv:KBxUqU2JXzA9OluogH65swYrKaNMR9M1ShaqWHclBUw=,tag:mAH5gXlzSvi4aDZRy2xQOg==,type:int]
-      password: ENC[AES256_GCM,data:KOllQ4ZjM2EhxPMVqePDp6Y=,iv:iW5nzdvAzXpUR4zyDkwBGYqrHQCTtFYmyO+AlMaTioE=,tag:gKM49pwUCukSOFY9Ugchag==,type:str]
-      sni: ENC[AES256_GCM,data:p7XIiaPEC5UUe0Hc,iv:CgLd9lQ9ivfouzxihzR/OX8KgvIvyj0DktI5YYZ6epE=,tag:EzBxiAuEeEz2jyF0M5Ee6A==,type:str]
-      skip-cert-verify: ENC[AES256_GCM,data:OWZySck=,iv:NdhxmrbSxrL0qIt5NOCon/l97t85ZcOhE/sodDSnU/8=,tag:2QGDQwfnpB+gpSShGL1NLQ==,type:bool]
-      alpn:
-        - ENC[AES256_GCM,data:4i8=,iv:U2ZC7f9uBtzps4q2QGFlw7rEeVk3HYwBtcQ9T4gJXdc=,tag:2dt177AuAxkuVAw9nG7gBg==,type:str]
-    - name: ENC[AES256_GCM,data:M1xh1A7B,iv:fmajJEeiZ6g9QCzmX9dAqJxcWgNKd17nDqQW+DVHAXI=,tag:2k+lMI4SgUFOYYN561NDaw==,type:str]
       type: ENC[AES256_GCM,data:h0grklnXHcch,iv:iyAYk+ozaR+lFYgqPU/7HN5zXhphBnGNu6boqwbGhwM=,tag:Jjh/GrkKo/Vw9OUshTz+aw==,type:str]
-      server: ENC[AES256_GCM,data:0yK3vD4CaVC6S3/e,iv:sc+YknJF5JG4xTu64bJJuJI7vGLoRc4rhWzqgFlYWms=,tag:OtWL9YBMOrkCnyBT0Z/YbA==,type:str]
+      server: ENC[AES256_GCM,data:fByASUq0i6vl00aT,iv:m7iykG0sJnyjBSuu9qD78bS918FD3fj9Gak0cBSidJw=,tag:U0y1WHvOmQ6f3qnz1Qs+Ag==,type:str]
-      port: ENC[AES256_GCM,data:VGeZ,iv:NXVEFcNZINpibZ8K6Q++vqva4ywHn8jth57lEOc5hSg=,tag:QGqt8/fG1S3sIT6ACiVYow==,type:int]
+      port: ENC[AES256_GCM,data:D/2Y,iv:/TOva98IWHrSeNHeFPkMq/GzkRu5k7RgddR0V5fp1mw=,tag:rS/kTisQ5Im4mcczmYpK/g==,type:int]
       ports: ENC[AES256_GCM,data:Y/HnLKFSNVJC3WM=,iv:kiQw+GKtY3n0+mP2Tt7HiQTALs+6sTWpFdsygWy+1S4=,tag:/C7yfaEWV01rJ5y0kifs5A==,type:str]
       password: ENC[AES256_GCM,data:41qnTwmzIWiGA8eVCWs7sq6gpg==,iv:6G8Zxi8P9h9wCF303ADTuOAV830NErok1bN2neFx8jM=,tag:6JxLB9sSF+2MzZAnTz7qsw==,type:str]
       up: ENC[AES256_GCM,data:d6L+m9ArMrM=,iv:EqD8slVt/Wf8Edj6qTKt2qFovgGDDBEUN+YFPF8ug7M=,tag:8FIxAgkKF4fu4Z8Zauar2Q==,type:str]
       down: ENC[AES256_GCM,data:RM5qROOyjsvf,iv:ESOrGbRPijJ9ptQrEduG3PW3CsuqCbneUxZg05lRcq4=,tag:FT/s5TYu+54byvfxv7eKvQ==,type:str]
-      sni: ENC[AES256_GCM,data:VwyqEXvRmkPZ528v,iv:mTw8lFBDeXAFnGLqRnnIDvxenvka3W6cFG8UMcct2Ys=,tag:tjjies51Zlpz7U8g3EUeUg==,type:str]
+      sni: ENC[AES256_GCM,data:p7XIiaPEC5UUe0Hc,iv:CgLd9lQ9ivfouzxihzR/OX8KgvIvyj0DktI5YYZ6epE=,tag:EzBxiAuEeEz2jyF0M5Ee6A==,type:str]
-      skip-cert-verify: ENC[AES256_GCM,data:O9ZyzxI=,iv:PIQPeY0PAMe/lAQN+9YWZl/ZY68jaFEJ/zVjpnihFKc=,tag:Ep0cuaBXa47F3yZo/MjqOg==,type:bool]
+      skip-cert-verify: ENC[AES256_GCM,data:uea1ExU=,iv:z7oRGpeLjzXA1RB5E3ucJu/bPo110v81AFR+4dDQYwA=,tag:AsorLzyJfwJNsJShlXQBtw==,type:bool]
       alpn:
-        - ENC[AES256_GCM,data:g/k=,iv:qa2hxVd5zH/bA0dL3QUezhkohhyOfISGzDjRPQ/gdRo=,tag:ljXzdUP2jaSV1PUvo0MYbQ==,type:str]
+        - ENC[AES256_GCM,data:0HY=,iv:I1stdmbZ2wKbYBN7bRLtz+4Ma7j8xect4HS9g0PKl0o=,tag:vI+jTgZWJSyag0dhXi0MKw==,type:str]
-    - name: ENC[AES256_GCM,data:524kL2VUV/Zr,iv:up5Map4oTAPmalvdpiZAob4wrxMAPu9w3Nk8VclDPOI=,tag:9FKxdoiHzUI9LBpt9QOy4g==,type:str]
+    - name: ENC[AES256_GCM,data:I/gOScJ4PYyG,iv:Wi3x1D25WX/m28FYenmU+g/laqosIHe0YpFQGYTIAAI=,tag:Vg/KqSIhxVetaloyeEp2FA==,type:str]
       type: ENC[AES256_GCM,data:C7hjfARP,iv:r+5/qimlashka+qMjrtlsOEMBFuN8/4SDrzzW/WM+KE=,tag:VVpvomQxVFxh/GTRW59p6g==,type:str]
+      server: ENC[AES256_GCM,data:fByASUq0i6vl00aT,iv:m7iykG0sJnyjBSuu9qD78bS918FD3fj9Gak0cBSidJw=,tag:U0y1WHvOmQ6f3qnz1Qs+Ag==,type:str]
+      port: ENC[AES256_GCM,data:wpvzzg==,iv:AGIlXqbfSCNGpJ/vNlK/ruAsEbhSyOpC5whLph7zIgM=,tag:kucLLNp+QfAXeVI3HwwPew==,type:int]
+      password: ENC[AES256_GCM,data:SoxJyZJLwxRQoErQ1ZHObnM=,iv:YVDRtTb0P15vA67ZUQgCBX1s16iqjrtG0oodE9RPDMI=,tag:zsKj2mwEWwDtJ9QGtbix2g==,type:str]
+      sni: ENC[AES256_GCM,data:p7XIiaPEC5UUe0Hc,iv:CgLd9lQ9ivfouzxihzR/OX8KgvIvyj0DktI5YYZ6epE=,tag:EzBxiAuEeEz2jyF0M5Ee6A==,type:str]
+      skip-cert-verify: ENC[AES256_GCM,data:uea1ExU=,iv:z7oRGpeLjzXA1RB5E3ucJu/bPo110v81AFR+4dDQYwA=,tag:AsorLzyJfwJNsJShlXQBtw==,type:bool]
+      alpn:
+        - ENC[AES256_GCM,data:bG8=,iv:7UIRMQ7KGnZUPvfFMGLcworWFQFdd9toCasEeg/IEco=,tag:QwkRWsGXBGxODKIasUqXuA==,type:str]
+    - name: ENC[AES256_GCM,data:M1xh1A7B,iv:fmajJEeiZ6g9QCzmX9dAqJxcWgNKd17nDqQW+DVHAXI=,tag:2k+lMI4SgUFOYYN561NDaw==,type:str]
+      type: ENC[AES256_GCM,data:h0grklnXHcch,iv:iyAYk+ozaR+lFYgqPU/7HN5zXhphBnGNu6boqwbGhwM=,tag:Jjh/GrkKo/Vw9OUshTz+aw==,type:str]
       server: ENC[AES256_GCM,data:UlqxHe1H1J1OH4Ld,iv:um1xP8HAqMTv8sqZewFBFaIoKq5MaVqultx7q9A9v4A=,tag:gGR1Uxwcap2gZYBmPuG76A==,type:str]
       port: ENC[AES256_GCM,data:D/2Y,iv:/TOva98IWHrSeNHeFPkMq/GzkRu5k7RgddR0V5fp1mw=,tag:rS/kTisQ5Im4mcczmYpK/g==,type:int]
-      password: ENC[AES256_GCM,data:SoxJyZJLwxRQoErQ1ZHObnM=,iv:YVDRtTb0P15vA67ZUQgCBX1s16iqjrtG0oodE9RPDMI=,tag:zsKj2mwEWwDtJ9QGtbix2g==,type:str]
+      ports: ENC[AES256_GCM,data:Y/HnLKFSNVJC3WM=,iv:kiQw+GKtY3n0+mP2Tt7HiQTALs+6sTWpFdsygWy+1S4=,tag:/C7yfaEWV01rJ5y0kifs5A==,type:str]
+      password: ENC[AES256_GCM,data:41qnTwmzIWiGA8eVCWs7sq6gpg==,iv:6G8Zxi8P9h9wCF303ADTuOAV830NErok1bN2neFx8jM=,tag:6JxLB9sSF+2MzZAnTz7qsw==,type:str]
+      up: ENC[AES256_GCM,data:d6L+m9ArMrM=,iv:EqD8slVt/Wf8Edj6qTKt2qFovgGDDBEUN+YFPF8ug7M=,tag:8FIxAgkKF4fu4Z8Zauar2Q==,type:str]
+      down: ENC[AES256_GCM,data:RM5qROOyjsvf,iv:ESOrGbRPijJ9ptQrEduG3PW3CsuqCbneUxZg05lRcq4=,tag:FT/s5TYu+54byvfxv7eKvQ==,type:str]
       sni: ENC[AES256_GCM,data:rkDSKvEwqgNZE4Yh,iv:Nfi9j5/IKygbSDgBAvAzHrqEYFMQPXjdI3aKHNiFdFs=,tag:N7MZw4nUOGlo4RIo08DAmA==,type:str]
       skip-cert-verify: ENC[AES256_GCM,data:uea1ExU=,iv:z7oRGpeLjzXA1RB5E3ucJu/bPo110v81AFR+4dDQYwA=,tag:AsorLzyJfwJNsJShlXQBtw==,type:bool]
       alpn:
         - ENC[AES256_GCM,data:0HY=,iv:I1stdmbZ2wKbYBN7bRLtz+4Ma7j8xect4HS9g0PKl0o=,tag:vI+jTgZWJSyag0dhXi0MKw==,type:str]
+    - name: ENC[AES256_GCM,data:524kL2VUV/Zr,iv:up5Map4oTAPmalvdpiZAob4wrxMAPu9w3Nk8VclDPOI=,tag:9FKxdoiHzUI9LBpt9QOy4g==,type:str]
+      type: ENC[AES256_GCM,data:C7hjfARP,iv:r+5/qimlashka+qMjrtlsOEMBFuN8/4SDrzzW/WM+KE=,tag:VVpvomQxVFxh/GTRW59p6g==,type:str]
+      server: ENC[AES256_GCM,data:UlqxHe1H1J1OH4Ld,iv:um1xP8HAqMTv8sqZewFBFaIoKq5MaVqultx7q9A9v4A=,tag:gGR1Uxwcap2gZYBmPuG76A==,type:str]
+      port: ENC[AES256_GCM,data:+JoG2A==,iv:RmALJNa9sBPVHUIWj+cG7ns6xp4F0leMRj5NUxzl7ig=,tag:+EmugWC/7Rv641I70w7U1g==,type:int]
+      password: ENC[AES256_GCM,data:SoxJyZJLwxRQoErQ1ZHObnM=,iv:YVDRtTb0P15vA67ZUQgCBX1s16iqjrtG0oodE9RPDMI=,tag:zsKj2mwEWwDtJ9QGtbix2g==,type:str]
+      sni: ENC[AES256_GCM,data:rkDSKvEwqgNZE4Yh,iv:Nfi9j5/IKygbSDgBAvAzHrqEYFMQPXjdI3aKHNiFdFs=,tag:N7MZw4nUOGlo4RIo08DAmA==,type:str]
+      skip-cert-verify: ENC[AES256_GCM,data:uea1ExU=,iv:z7oRGpeLjzXA1RB5E3ucJu/bPo110v81AFR+4dDQYwA=,tag:AsorLzyJfwJNsJShlXQBtw==,type:bool]
+      alpn:
+        - ENC[AES256_GCM,data:bG8=,iv:7UIRMQ7KGnZUPvfFMGLcworWFQFdd9toCasEeg/IEco=,tag:QwkRWsGXBGxODKIasUqXuA==,type:str]
+    - name: ENC[AES256_GCM,data:1M31k80NuPJaT90=,iv:3EMCEptjHXOHDOkPcfLw0BHR/eOAndYLtJyXFIM8Xwg=,tag:di9w082wTA1mk8iu8oA8yQ==,type:str]
+      type: ENC[AES256_GCM,data:h0grklnXHcch,iv:iyAYk+ozaR+lFYgqPU/7HN5zXhphBnGNu6boqwbGhwM=,tag:Jjh/GrkKo/Vw9OUshTz+aw==,type:str]
+      server: ENC[AES256_GCM,data:xPCnWkVYwD2Ty0IzUJPvY6U=,iv:Vz2QPfHSsVc3jVWj4hPNkMl2zCAvQgb9UdmMTEjdLHM=,tag:Ym1vSk7J5Zfi5UAVoCNq7Q==,type:str]
+      port: ENC[AES256_GCM,data:D/2Y,iv:/TOva98IWHrSeNHeFPkMq/GzkRu5k7RgddR0V5fp1mw=,tag:rS/kTisQ5Im4mcczmYpK/g==,type:int]
+      ports: ENC[AES256_GCM,data:Y/HnLKFSNVJC3WM=,iv:kiQw+GKtY3n0+mP2Tt7HiQTALs+6sTWpFdsygWy+1S4=,tag:/C7yfaEWV01rJ5y0kifs5A==,type:str]
+      password: ENC[AES256_GCM,data:41qnTwmzIWiGA8eVCWs7sq6gpg==,iv:6G8Zxi8P9h9wCF303ADTuOAV830NErok1bN2neFx8jM=,tag:6JxLB9sSF+2MzZAnTz7qsw==,type:str]
+      up: ENC[AES256_GCM,data:d6L+m9ArMrM=,iv:EqD8slVt/Wf8Edj6qTKt2qFovgGDDBEUN+YFPF8ug7M=,tag:8FIxAgkKF4fu4Z8Zauar2Q==,type:str]
+      down: ENC[AES256_GCM,data:RM5qROOyjsvf,iv:ESOrGbRPijJ9ptQrEduG3PW3CsuqCbneUxZg05lRcq4=,tag:FT/s5TYu+54byvfxv7eKvQ==,type:str]
+      sni: ENC[AES256_GCM,data:+PlKKl8N73CiANmWYnMLQDI=,iv:NizAQl+xLuvJHVpGfzrJLNa1b+B7q2SbIHpLjdoUjfY=,tag:tdNPsIgMO1s3CRggRm+gpA==,type:str]
+      skip-cert-verify: ENC[AES256_GCM,data:uea1ExU=,iv:z7oRGpeLjzXA1RB5E3ucJu/bPo110v81AFR+4dDQYwA=,tag:AsorLzyJfwJNsJShlXQBtw==,type:bool]
+      alpn:
+        - ENC[AES256_GCM,data:0HY=,iv:I1stdmbZ2wKbYBN7bRLtz+4Ma7j8xect4HS9g0PKl0o=,tag:vI+jTgZWJSyag0dhXi0MKw==,type:str]
+    - name: ENC[AES256_GCM,data:zKRNc9xfDgCx8Yxpp0I=,iv:plmHDReDGfVCz1i7QlN/Oo+5hhME2mw0il+LdgE+pN4=,tag:BtXj8qG5UeAYMAbcWSRnaQ==,type:str]
+      type: ENC[AES256_GCM,data:C7hjfARP,iv:r+5/qimlashka+qMjrtlsOEMBFuN8/4SDrzzW/WM+KE=,tag:VVpvomQxVFxh/GTRW59p6g==,type:str]
+      server: ENC[AES256_GCM,data:xPCnWkVYwD2Ty0IzUJPvY6U=,iv:Vz2QPfHSsVc3jVWj4hPNkMl2zCAvQgb9UdmMTEjdLHM=,tag:Ym1vSk7J5Zfi5UAVoCNq7Q==,type:str]
+      port: ENC[AES256_GCM,data:x46frQ==,iv:y3ZtVJQP3q08duFGUXSH5xLo9Q6GZmGvhmCKzNiztfE=,tag:2k6WGrK1wGa4QwOYJHnwkw==,type:int]
+      password: ENC[AES256_GCM,data:SoxJyZJLwxRQoErQ1ZHObnM=,iv:YVDRtTb0P15vA67ZUQgCBX1s16iqjrtG0oodE9RPDMI=,tag:zsKj2mwEWwDtJ9QGtbix2g==,type:str]
+      sni: ENC[AES256_GCM,data:+PlKKl8N73CiANmWYnMLQDI=,iv:NizAQl+xLuvJHVpGfzrJLNa1b+B7q2SbIHpLjdoUjfY=,tag:tdNPsIgMO1s3CRggRm+gpA==,type:str]
+      skip-cert-verify: ENC[AES256_GCM,data:uea1ExU=,iv:z7oRGpeLjzXA1RB5E3ucJu/bPo110v81AFR+4dDQYwA=,tag:AsorLzyJfwJNsJShlXQBtw==,type:bool]
+      alpn:
+        - ENC[AES256_GCM,data:bG8=,iv:7UIRMQ7KGnZUPvfFMGLcworWFQFdd9toCasEeg/IEco=,tag:QwkRWsGXBGxODKIasUqXuA==,type:str]
 proxy-providers:
     ykk:
         type: ENC[AES256_GCM,data:QFH7Kw==,iv:uBwdbVdfQuoJ4wIxT9lAS/b0C167IwJbD2KhrB1VzkM=,tag:8ogC9VITAOfeMtceq20Wtw==,type:str]
@@ -83,12 +83,12 @@ proxy-groups:
     - name: ENC[AES256_GCM,data:O6LAzFQ=,iv:a+dfdy14adLlYbJQ5wAQLsD5hxuEXKW8Y/erhBVAREE=,tag:79++dpg2E2Mtc8y63nRcHw==,type:str]
       type: ENC[AES256_GCM,data:JR3d3D1p,iv:n0u8vayA0PVDM7yvh2pk36S8EeqMnZRN8TZlwNnEC3U=,tag:ZmxXOralviL2xyd8+hN3ZA==,type:str]
       proxies:
-        - ENC[AES256_GCM,data:W2Edq917,iv:JYOZXBOTW324WKslU8/BQv/+mcuvfipbvFU77e+mHJQ=,tag:ynazg1UWRbYsejv0fpgPtQ==,type:str]
-        - ENC[AES256_GCM,data:bc6mdrU795wv,iv:KsaxAFooTwb6r5sLYxnKAokIsE6/sZn0e5izwowHZQQ=,tag:wrHQl5yI44V40ESI3KQOSA==,type:str]
         - ENC[AES256_GCM,data:IEFd/SNk,iv:JFLQaa5nk02nXesGC1fcyV7LexOa4dHjjqNKlttwp4Y=,tag:DeP4oT3xcfOEzff8RwoZyQ==,type:str]
         - ENC[AES256_GCM,data:W4BYLRg/tYN3,iv:QfLjSOm/tVDihmgUaFAI3fp2+c0kSil34pdR2pZobLw=,tag:aLvSMitNmxbgFU/mapYgwg==,type:str]
         - ENC[AES256_GCM,data:heJ5CLaS,iv:yF6YaM4UmxcwgPMgbi5shzLC4fv+yNX15rVLRCos6c4=,tag:+0EKyuEHx2hu7BEXZEdJew==,type:str]
         - ENC[AES256_GCM,data:fDVLR0770KUF,iv:prsxi6lcvMg6I+2o4rlAYuepUdjAPHpFfzCf6LyXj3M=,tag:rXMVs9EBOq5oCWHYtesZXQ==,type:str]
+        - ENC[AES256_GCM,data:iYSMK4S+yuT9p9s=,iv:yBGjJSYItlzA6mBDdHYgcx0oM+WL5CfgWB68cFOmvXc=,tag:49lgLg8hE9hs3Pbv6nZTkg==,type:str]
+        - ENC[AES256_GCM,data:BRdw54Oq5sR2SaFXg/U=,iv:yS1MyVh0MjxctPFE1D3wrbVqztJJM8JP0gtkqgu6zdY=,tag:rJtHptplT8ZiPOXiQqvr8w==,type:str]
       use:
         - ENC[AES256_GCM,data:hGy4,iv:LS9vHmdXUMuy0Na1z5YMpB+vEwKFLfezsftdWcWjTv0=,tag:lueXcksvaPC1yKpHT2zUag==,type:str]
 rules:
@@ -122,7 +122,7 @@ sops:
             SG5UYTRhVktVd200U2p0emNNNm40eVUKKUpCDl0oOkyrMsM4tTYXqnN8UMwPehqB
             Xt04S5YyETUYm40RVNJ/5hwMa4akZNOITvJwQwrzZK1vI42lEN0EYw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-04-12T10:27:08Z"
+    lastmodified: "2025-05-25T04:04:00Z"
-    mac: ENC[AES256_GCM,data:7FgE9wuRKFPNCXD+g+38mMSizBWwIoLyhEO9uIm4zz2mt9xKgECA3P+IBR0tYa7DmPl8SYNm9visBSZCX9GZX0TfhAA001c1ees6gdhR9NvqvNSboyrXa7FMIyWREsDavMigIrSfBhsfHG/4s1Q/QwE72xntMKYTtjAnmP59/M4=,iv:50g6MyVcWeT38Wr+E9xj9OU8WGku3ThPTgD7W7g953s=,tag:1+nliqmuacDog5p4M3nBbQ==,type:str]
+    mac: ENC[AES256_GCM,data:+WCayJ0HV1C53z9ChMfIWGyeNxy4FHpTIeUFIf0k8VjGy+tEbLEYG0Enow0eU+HTJFF+phgzyfpV9XTfWfzkJ+bL2hl8+z2x+dKFszOdi87/6uNdc/9hLgZ2qJcFmGjuEEoX8i8tv2NgU9mY7274snFlppKam5Q7JTutHwLWCJQ=,iv:Er0Ccn/He7H0UpNvL+kzxYoLRiHLnkkEUvZwM/oIn9k=,tag:I4534xc6f8aTaVaXj3WXrw==,type:str]
     unencrypted_suffix: _unencrypted
-    version: 3.10.1
+    version: 3.10.2