Commit 645171d
Changed files (2)
modules
services
modules/services/mihomo/proxy-groups.nix
@@ -36,42 +36,15 @@
};
regions = {
- HK = {
- flag = "ππ°";
- filter = filterHK;
- };
- TW = {
- flag = "πΉπΌ";
- filter = filterTW;
- };
- JP = {
- flag = "π―π΅";
- filter = filterJP;
- };
- KR = {
- flag = "π°π·";
- filter = filterKR;
- };
- SG = {
- flag = "πΈπ¬";
- filter = filterSG;
- };
- US = {
- flag = "πΊπΈ";
- filter = filterUS;
- };
- UK = {
- flag = "π¬π§";
- filter = filterUK;
- };
- FR = {
- flag = "π«π·";
- filter = filterFR;
- };
- DE = {
- flag = "π©πͺ";
- filter = filterDE;
- };
+ HK.filter = filterHK;
+ TW.filter = filterTW;
+ JP.filter = filterJP;
+ KR.filter = filterKR;
+ SG.filter = filterSG;
+ US.filter = filterUS;
+ UK.filter = filterUK;
+ FR.filter = filterFR;
+ DE.filter = filterDE;
};
in
[
@@ -85,14 +58,14 @@
{
name = "MANUAL";
type = "select";
- proxies = ["Others - MANUAL"] ++ (map (x: "${regions.${x}.flag} - MANUAL") (builtins.attrNames regions));
+ proxies = ["Others - MANUAL"] ++ (map (x: "${x} - MANUAL") (builtins.attrNames regions));
url = "http://connectivitycheck.platform.hicloud.com/generate_204";
icon = "https://raw.githubusercontent.com/Orz-3/mini/master/Color/Cylink.png";
}
{
name = "AUTO";
type = "select";
- proxies = map (x: "${regions.${x}.flag} - AUTO") (builtins.attrNames regions);
+ proxies = map (x: "${x} - AUTO") (builtins.attrNames regions);
url = "http://connectivitycheck.platform.hicloud.com/generate_204";
icon = "https://raw.githubusercontent.com/Orz-3/mini/master/Color/Urltest.png";
}
@@ -100,13 +73,13 @@
++ (map (x:
urlTest
// {
- name = "${regions.${x}.flag} - AUTO";
+ name = "${x} - AUTO";
filter = regions.${x}.filter;
}) (builtins.attrNames regions))
++ (map (x:
select
// {
- name = "${regions.${x}.flag} - MANUAL";
+ name = "${x} - MANUAL";
filter = regions.${x}.filter;
}) (builtins.attrNames regions))
++ [
modules/services/mihomo/rules.nix
@@ -76,8 +76,8 @@
# Common
"RULE-SET,cdn_domainset,SELECT"
"RULE-SET,cdn_non_ip,SELECT"
- "RULE-SET,stream_non_ip,πΊπΈ - AUTO"
- "RULE-SET,telegram_non_ip,πΊπΈ - AUTO"
+ "RULE-SET,stream_non_ip,US - AUTO"
+ "RULE-SET,telegram_non_ip,US - AUTO"
"RULE-SET,apple_cdn,DIRECT"
"RULE-SET,download_domainset,SELECT"
"RULE-SET,download_non_ip,SELECT"
@@ -85,7 +85,7 @@
"RULE-SET,apple_cn_non_ip,DIRECT"
"RULE-SET,apple_services,DIRECT"
"RULE-SET,microsoft_non_ip,DIRECT"
- "RULE-SET,ai_non_ip,πΊπΈ - AUTO"
+ "RULE-SET,ai_non_ip,US - AUTO"
"RULE-SET,global_non_ip,SELECT"
"RULE-SET,domestic_non_ip,DIRECT"
"RULE-SET,direct_non_ip,DIRECT"
@@ -93,8 +93,8 @@
# === IP ===
"RULE-SET,reject_ip,REJECT"
"RULE-SET,my_hosts,DIRECT"
- "RULE-SET,telegram_ip,πΊπΈ - AUTO"
- "RULE-SET,stream_ip,πΊπΈ - AUTO"
+ "RULE-SET,telegram_ip,US - AUTO"
+ "RULE-SET,stream_ip,US - AUTO"
"RULE-SET,lan_ip,DIRECT"
"RULE-SET,domestic_ip,DIRECT"
"RULE-SET,china_ip,DIRECT"