From acd31e0be14d4ee5574d8966bc4ad78759104db1 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Tue, 23 Apr 2024 04:40:41 +0800 Subject: [PATCH] nixos/clash-meta-client: use lightsail-tokyo --- nixos/profiles/common/opt-in/clash-meta-client/config.yaml | 2 +- nixos/profiles/common/opt-in/clash-meta-client/default.nix | 5 +++++ secrets.yaml | 6 ++++-- 3 files changed, 10 insertions(+), 3 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 ab4b6e5..1f021f3 100644 --- a/nixos/profiles/common/opt-in/clash-meta-client/config.yaml +++ b/nixos/profiles/common/opt-in/clash-meta-client/config.yaml @@ -30,7 +30,7 @@ tcp-concurrent: true geodata-mode: true proxy-groups: - - { name: PROXY, type: select, proxies: [自动选择, 备用自动选择, DIRECT] } + - { name: PROXY, type: select, proxies: [自动选择, 备用自动选择, DIRECT, lightsail] } - { 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 ff93137..4948850 100644 --- a/nixos/profiles/common/opt-in/clash-meta-client/default.nix +++ b/nixos/profiles/common/opt-in/clash-meta-client/default.nix @@ -26,6 +26,7 @@ ### sops-nix sops.secrets = builtins.mapAttrs (_name: value: value // {restartUnits = ["mihomo.service"];}) { "clash/secret" = {}; + "clash/proxies/lightsail" = {}; "clash/proxy-providers/flyairport" = {}; "clash/proxy-providers/efcloud" = {}; "clash/proxy-providers/kogeki" = {}; @@ -38,6 +39,10 @@ builtins.readFile ./config.yaml + '' secret: "${config.sops.placeholder."clash/secret"}" + + proxies: + ${config.sops.placeholder."clash/proxies/lightsail"} + proxy-providers: flyairport: <<: *fetch diff --git a/secrets.yaml b/secrets.yaml index 642ea00..0c7cdb3 100644 --- a/secrets.yaml +++ b/secrets.yaml @@ -5,6 +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: + lightsail: ENC[AES256_GCM,data:aoZhIKOLZK6TK3dXWZBZ637OPgN+BBNu0AX0sGdOg4GZAf6H2MVMBST2/SBgdJ6w/bsF8+QFbyd/D9TctonJwxNyKguhfUR8bkRdtpkzKVBHe6Aem/5sSPybWjKNkewUE0rPqU5NwFKfDDngJgnQeulv5ulBcylLyCk30Y1E6Cah7R7NroD7rFFzId+VzQM4adUObcGT3XdtT78XPcS2uEOZUXKbhlB/9133rFI0glEBEm+K3WwN8ukHQ9wW5QkBP2paB4o6iAaDuBLlrQo3U7XLqN/5SBwhyxccEkq24qTxdH8iRpBoJ31Iv9XWSUWyNpzFpvu0ffBVHvCDPIij16BR79fXlzSt6fRob87Gud/DAru7Y7tUMd0=,iv:UQrYqosgI1RI83ZSF09YJXA52MHUpsjmARC4/fJwDxY=,tag:p239REW5qP/UzNjh0xVkzQ==,type:str] proxy-providers: flyairport: ENC[AES256_GCM,data:akHdU/2o8D65sG2b/mcj76HASwhg3WvoEcrpgkXPyh7kuc+Ci42hmmmmBk9I29vuvZjTtCTs8mMzaLK1wm8TS/K1A1zeAGULxSsqhpV4cA19Q4vAtQ2+FyuGiaFszuaHK6BSlZAosfmCGoM1nZRYuOnsdeR0vnHBIHhJFNhaLw==,iv:VeVT3cEaOO/90gcqpm2yOacThbEyaXuBRhp4buX/XOY=,tag:kojJbqwYk/DNFBcJMY2eXg==,type:str] efcloud: ENC[AES256_GCM,data:GvKNMscPknhlBy9Qp8iuYoxF10oX2ZIOKo+XKRH2NOGGDiMk/GwdGfA5+gf3ZcEEGFGw/8CrBddjJCivyxqwF+oAEHJyjdcFhGyyOopsx9s3waq8Hge/KzE=,iv:WXAd3yA5cTZp+ttKHXPf6cbsk6pRXq5/xMysNUAs1Rk=,tag:HygexRSW8ICa+RIFmrRKRQ==,type:str] @@ -52,8 +54,8 @@ sops: SC9YMFk4dUNOUDJYMXErck8yTmJmZmcKp66bHZTD6VitAOfzIr8VJr02+R9f5mxH c5n2CWurDsZsNTKk7pgxQo78ySyAG3rzvOqgK0NFesyHy9dRl8xHCQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-04-01T04:24:51Z" - mac: ENC[AES256_GCM,data:cJYaWZvPI+cWeWBNZS5omgfZ7Jq7mPIPc/wle5s4XkAb5AgvFaT17FmBRRYBVLvGvevSRponU3z6kLvLbH1HfE89zpboPc76+6vmYPkx8bY+vy8lgg5BTWPHkQZ6BeORJQLi3aiH6CNOOD7wL1dlwD+ldZOD7D9kgxTwbFPX+V8=,iv:TFe6eY+M6qsvJDv09RovOLbRfNkcU8JHR1EaJtJKKIE=,tag:dAU7eFTmJpCGt/gxrwoRkQ==,type:str] + lastmodified: "2024-04-22T20:38:52Z" + mac: ENC[AES256_GCM,data:A+8o7hkJI43ufArv5baN7SkauWg3sh9rcTWJy/8h8tD7UPcK8NIvsggtcT2vWCsXQ+SywdCRQMXBwXuA5qSdXs5HJys+aY2BB1rylMScXLYFYA6KXTIeur8l592lU9TOwPp/RALpEQfg7eu2Ps2xdBEgeVbrnn040+3oTqA/Dpo=,iv:1ZRkJDr3Bbx2fRPmLFZAWi6g2QBO5ZEIiFuPgDueRLI=,tag:lkljJXaa7VoUSH6NKQKJ6Q==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1