From b25ec277971307c2b84acc6217097c58e7454dd0 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 25 Jul 2024 23:04:22 +0800 Subject: [PATCH] nixos/mihomo: cleanup --- nixos/profiles/opt-in/mihomo/config.yaml | 34 +----------------------- nixos/profiles/opt-in/mihomo/default.nix | 6 ----- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/nixos/profiles/opt-in/mihomo/config.yaml b/nixos/profiles/opt-in/mihomo/config.yaml index 059de41..1e64e24 100644 --- a/nixos/profiles/opt-in/mihomo/config.yaml +++ b/nixos/profiles/opt-in/mihomo/config.yaml @@ -14,15 +14,6 @@ use: &use - flyairport - spcloud -use-backup: &use-backup - type: select - use: - - ermaozi - - jsnzkpg - - pawdroid - -convert: &convert "https://sub.maoxiongnet.com/sub?target=clash&list=true&url=" - port: 7890 external-controller: 127.0.0.1:9090 log-level: warning @@ -46,32 +37,9 @@ proxy-providers: <<: *fetch url: "@clash/proxy-providers/spcloud@" - # Free servers that I dont really care about - ermaozi: - <<: *fetch - url: "@ermaozi@" - jsnzkpg: - <<: *fetch - url: "@jsnzkpg@" - pawdroid: - <<: *fetch - url: "@pawdroid" - proxy-groups: - - { - name: PROXY, - type: select, - proxies: [自动选择, 备用自动选择, DIRECT, lightsail], - } + - { name: PROXY, type: select, proxies: [自动选择, lightsail, DIRECT] } - { name: 自动选择, <<: *use, tolerance: 2, type: url-test } - - { name: 备用自动选择, <<: *use-backup, tolerance: 2, type: url-test } - - # 分隔,下面是地区分组 - #- { name: 香港, <<: *use, type: url-test, filter: "(?i)港|hk|hongkong|hong kong" } - - { name: 台湾, <<: *use, type: url-test, filter: "(?i)台|tw|taiwan" } - #- { name: 日本, <<: *use, type: url-test, filter: "(?i)日本|jp|japan" } - #- { name: 美国, <<: *use, type: url-test, filter: "(?i)美|us|unitedstates|united states" } - #- { name: 新加坡, <<: *use, type: url-test, filter: "(?i)(新|sg|singapore)" } rules: - GEOIP, lan, DIRECT, no-resolve diff --git a/nixos/profiles/opt-in/mihomo/default.nix b/nixos/profiles/opt-in/mihomo/default.nix index 089564f..85823de 100644 --- a/nixos/profiles/opt-in/mihomo/default.nix +++ b/nixos/profiles/opt-in/mihomo/default.nix @@ -40,7 +40,6 @@ # why not substituteAll? see https://github.com/NixOS/nixpkgs/issues/237216 sops.templates."clash.yaml".file = let - convert = url: "https://sub.maoxiongnet.com/sub?target=clash&list=true&url=${url}"; substituteV2 = {src, ...} @ args: let args' = lib.removeAttrs args ["src"]; in @@ -59,10 +58,5 @@ "clash/proxy-providers/flyairport" "clash/proxy-providers/spcloud" ; - - # Free servers that I dont really care about - pawdroid = convert "https://cdn.jsdelivr.net/gh/Pawdroid/Free-servers@main/sub"; - ermaozi = convert "https://cdn.jsdelivr.net/gh/ermaozi/get_subscribe@main/subscribe/v2ray.txt"; - jsnzkpg = convert "https://cdn.jsdelivr.net/gh/Jsnzkpg/Jsnzkpg@Jsnzkpg/Jsnzkpg"; }; }