From 1cfd99fc531a5d78f307579ed8dba42081c3aad2 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Mon, 12 Feb 2024 14:03:03 +0800
Subject: [PATCH] secrets/clash: update

---
 .../profiles/common/opt-in/clash-meta-client/config.yaml | 3 ++-
 .../profiles/common/opt-in/clash-meta-client/default.nix | 9 ++++-----
 secrets.yaml                                             | 7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/profiles/common/opt-in/clash-meta-client/config.yaml b/nixos/profiles/common/opt-in/clash-meta-client/config.yaml
index 14aea22..5afe517 100644
--- a/nixos/profiles/common/opt-in/clash-meta-client/config.yaml
+++ b/nixos/profiles/common/opt-in/clash-meta-client/config.yaml
@@ -10,6 +10,7 @@ fetch: &fetch
 use: &use
   type: select
   use:
+    - efcloud
     - kogeki
     - spcloud
 
@@ -28,7 +29,7 @@ tcp-concurrent: true
 geodata-mode: true
 
 proxy-groups:
-  - { name: PROXY, type: select, proxies: [自动选择, 备用自动选择, DIRECT, lon0] }
+  - { name: PROXY, type: select, proxies: [自动选择, 备用自动选择, DIRECT] }
   - { name: 自动选择, <<: *use, tolerance: 2, type: url-test }
   - { name: 备用自动选择, <<: *use-backup, tolerance: 2, type: url-test }
 
diff --git a/nixos/profiles/common/opt-in/clash-meta-client/default.nix b/nixos/profiles/common/opt-in/clash-meta-client/default.nix
index 168a19c..8f32832 100644
--- a/nixos/profiles/common/opt-in/clash-meta-client/default.nix
+++ b/nixos/profiles/common/opt-in/clash-meta-client/default.nix
@@ -25,7 +25,7 @@
   ### sops-nix
   sops.secrets = builtins.mapAttrs (_name: value: value // {restartUnits = ["clash.service"];}) {
     "clash/secret" = {};
-    "clash/proxies/lon0" = {};
+    "clash/proxy-providers/efcloud" = {};
     "clash/proxy-providers/kogeki" = {};
     "clash/proxy-providers/spcloud" = {};
   };
@@ -36,11 +36,10 @@
     builtins.readFile ./config.yaml
     + ''
       secret: "${config.sops.placeholder."clash/secret"}"
-
-      proxies:
-        ${config.sops.placeholder."clash/proxies/lon0"}
-
       proxy-providers:
+        efcloud: 
+          <<: *fetch
+          url: "${config.sops.placeholder."clash/proxy-providers/efcloud"}"
         kogeki:
           <<: *fetch
           url: "${config.sops.placeholder."clash/proxy-providers/kogeki"}"
diff --git a/secrets.yaml b/secrets.yaml
index e6d684f..cecded0 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -5,9 +5,8 @@ wireless:
     OpenWrt: ENC[AES256_GCM,data:tlZJExED1Brv4/hOJjbgEbyLMQZVfNhl/5ux94IDM5jSL2lEBYy74qf4VVn2SKMYUuu7bjV7UlnwrD/jzDRuO/gWfkeuoZ5uh3pX0s2wv5E2Z7nJjkYtVn0XDlr8m/4Y6R14ahSIqKJKY4LAAeuQo0t7jEeYv4E3kuyhXUNE5jjrdD9mW+ObS1WV/DpBqUZc3dJe+88EVzgVa5F/L+VWQ3Klz5TduQzqfOyjjoNe+z8gwODzHczfPZCdplfo4PbrMWV8FlyUdJUX37nkZiEkyUpPuksZHb5OPAtx9fCh/KF5y/txS9oZTwOkiE4LBQBpj2NcLMQGOEdtRYLzJekyaOGChrtD+mFfL9LBuLwQLAzHLUI4oZ3PUgu3zXYevtmyrSSwlK/2iama71swmNu+qYws+WkjMVyF4MB/KCtMJULbZW9XJp7tw7cfSzek0RMizlk3MgrEyF2w3J9vx6Q4OHPSE48kgK2Kw0kg93wl9uO6kCRq0QiTJ6lZHopsWyWHTcs1,iv:kvBRYkhFAmDCSdU5Nkc66VblbjQfWHp7ls8x0d46ueA=,tag:Y/oa7vgoI/VsZ+OyJUjZ/g==,type:str]
 clash:
     secret: ENC[AES256_GCM,data:eCq/pDlSOw==,iv:QGNKxqmkj9BWFBJGj/O4fUL8Ey8zGEHMsWX02DrM82U=,tag:z2vVCBSt6mw47ca2xoxg9A==,type:str]
-    proxies:
-        lon0: ENC[AES256_GCM,data:djrvbuT59hIYoGsicuI1vLRhs+vbGXOremRXMlz0J/txyqHDBmQWA3ggKtsWjX/HX0NrdizzDoglCj0l2jgtLnluVnPtf5juqZCoPfk/sdD9X0ekL+jyMn/1TGnI2sUvLznZ/4H8Y8P3H+naSqYlN7tgvN4CbIlW1ahpkN8skHar4r7Z9QaMaUDVZhLBJKD+wCN8Jt16jN/rgKOEEg7sLk51GmefUQpjCrcUWZuiR/xpDuuVeoSfOv7XUYvSGvAd8/7Jm040Uae/EbjbeZcRSNxWTefiRPVm8TGYmA52CHEnPKKVdm5j8TOc2wb+5BkT46+ftP+gxekbJvm0FAUX4JCgxLpAK4AELO2sTbZ7qZ3AcqmZzg==,iv:6lXfbseA0Lbq5ZSxNVKLisObHlrCRgkkb1hShWF2ryo=,tag:7Cxgi+/c+lf/nbiLcYdL1Q==,type:str]
     proxy-providers:
+        efcloud: ENC[AES256_GCM,data:GvKNMscPknhlBy9Qp8iuYoxF10oX2ZIOKo+XKRH2NOGGDiMk/GwdGfA5+gf3ZcEEGFGw/8CrBddjJCivyxqwF+oAEHJyjdcFhGyyOopsx9s3waq8Hge/KzE=,iv:WXAd3yA5cTZp+ttKHXPf6cbsk6pRXq5/xMysNUAs1Rk=,tag:HygexRSW8ICa+RIFmrRKRQ==,type:str]
         kogeki: ENC[AES256_GCM,data:159GepC8UUm4FA7vRZO9RJ5DCPigt8RUsm78ibVjU8SHKTtMS6bHPA40S8l6V07VJmytRaXqWCIkiI7dXR64UvoRe+gMD2a0y8UgM4Pncf0IWpxhag==,iv:KBf4IPfof4bgs87udH+aXQ95K3F1Zuw5Ueh+b4AkQFg=,tag:F8TPR5kxIlmA+LG7kvz3HQ==,type:str]
         spcloud: ENC[AES256_GCM,data:Uz0SLmSxzV/hcsBuYtlsZ5G5E8wjzmHcFMGCyBrEewOr6gAdBQvC4njotYbMIdQAQRTgAE2wBukdSxXWCTrNph7uoVhskz1YkNjxnQVPUO5WfQ==,iv:TwHPdeATx+LanfhHeD7M5sSf3M2NLBWBAAaFTwgsK7A=,tag:9DMgcSoy4ksYl/dPWwA+dA==,type:str]
 sops:
@@ -34,8 +33,8 @@ sops:
             bEdVQ0dicTVaRkJUNFB0d3Y1S1hmL3MKFVPyIyjRkQcdimUE/tWxQzQU1cqkB5lN
             o+7a8JuA5gOxG7OInWbfkDe9/wSFCJW2S5z9jON/tLy6atPdmPYUdg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-01T01:42:20Z"
-    mac: ENC[AES256_GCM,data:4nTXlRI/9bceFb4/K4dorVfPUMGy7Tp2uFHNOQO2ajZnPdAKf7fjwLfOJm9/8cHkIj6mtHd0rq57utvsBFcj316/Te+kD3vkVTJzEY9EPP4YSyD/BDj7GOYcEifdU/FKM9NVQnszsf7SWTSZ3q+dMDmXPss96T7PK6XeXRf/TAU=,iv:DFirwJVO4lPKYlXVIDsZfMRRcVgQTCcekwggaTIOx80=,tag:G3efIaEnEM72SCsZKKDqjQ==,type:str]
+    lastmodified: "2024-02-12T06:09:46Z"
+    mac: ENC[AES256_GCM,data:EYe/XOQo+zbsx/2Iwqa8o2Ez2MoE+OacQnXSwyL+YM5olk7uvDFnnnfDBIth5tIqsXJ3HzJqW82rTotwUCrQ7UYbfwq72j3gIF18XQe+n1ahoTBkzudBFXJb84sY7tQDexUzA+SC3LTIJGiHItZ+H23ou6iKFEU6V6FCdJRlLb8=,iv:XDeKRZfx9Lej9Ql4jY/gMWGlY+thx9y4bXRanhOAa3E=,tag:6c91OAH3bAjndpQr+0e90g==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1