primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 06:39:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

vanadium/connectivity: pin blocklist inside module

Browse source
This commit is contained in:
Primrose 2025-10-23 10:01:37 +08:00
parent 2b8b277e6d
commit 9ed0935679
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
2 changed files with 27 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

40
nix/configurations/vanadium/nixos/connectivity.nix
View file

@ -109,22 +109,36 @@
# Blocklists are made of one pattern per line. # Blocklists are made of one pattern per line.
# https://github.com/DNSCrypt/dnscrypt-proxy/blob/fa59f990431a49b6485f63f96601bc7e64017bf8/dnscrypt-proxy/example-dnscrypt-proxy.toml#L583C4-L583C75 # https://github.com/DNSCrypt/dnscrypt-proxy/blob/fa59f990431a49b6485f63f96601bc7e64017bf8/dnscrypt-proxy/example-dnscrypt-proxy.toml#L583C4-L583C75
blocked_names_file = let blocked_names_file = let
sources = import ../../../../npins;
# Prevent building up reliance on chatbots # Prevent building up reliance on chatbots
# Gotta preserve that thinking ability of my smoof bwain # Gotta preserve that thinking ability of my smoof bwain
ai_list = lib.pipe (builtins.readFile "${sources.ai-blocklist}/noai_hosts.txt") [ ai_list = let
(lib.replaceStrings ["\r\n"] ["\n"]) # convert to unix ending just in case src = pkgs.fetchFromGitHub {
(lib.splitString "\n") owner = "laylavish";
(builtins.filter (x: ! (x == "" || lib.hasPrefix "#" x))) repo = "uBlockOrigin-HUGE-AI-Blocklist";
(builtins.map (x: builtins.elemAt (lib.splitString " " x) 1)) # remove 0.0.0.0 rev = "9bb188e2701138e03f73bacebd6b19b181ca0012";
]; hash = "sha256-p3wfR28DH6V8BHn9DT10d09Yq3mdbBecWwlR1CdDYUA=";
};
in
lib.pipe (builtins.readFile "${src}/noai_hosts.txt") [
(lib.replaceStrings ["\r\n"] ["\n"]) # convert to unix ending just in case
(lib.splitString "\n")
(builtins.filter (x: ! (x == "" || lib.hasPrefix "#" x)))
(builtins.map (x: builtins.elemAt (lib.splitString " " x) 1)) # remove 0.0.0.0
];
hategroup_list = lib.pipe (builtins.readFile "${sources.hategroup-blocklist}/blocklist.txt") [ hategroup_list = let
(lib.replaceStrings ["\r\n"] ["\n"]) # convert to unix ending just in case src = pkgs.fetchFromGitHub {
(lib.splitString "\n") owner = "chigh";
(builtins.filter (x: ! (x == "" || lib.hasPrefix "#" x))) repo = "hategroup-dnsbl";
]; rev = "cc19c050997d5f54014bb20c764b131e003dfb17";
hash = "sha256-SZBrjIBUw687MdrbOV7WrP5IhAAtKvPL2GqdcICHNvQ=";
};
in
lib.pipe (builtins.readFile "${src}/blocklist.txt") [
(lib.replaceStrings ["\r\n"] ["\n"]) # convert to unix ending just in case
(lib.splitString "\n")
(builtins.filter (x: ! (x == "" || lib.hasPrefix "#" x)))
];
combined_lists = ai_list ++ hategroup_list; combined_lists = ai_list ++ hategroup_list;
in in

28
npins/sources.json
View file

@ -16,20 +16,6 @@
"url": "https://api.github.com/repos/ryantm/agenix/tarball/0.15.0", "url": "https://api.github.com/repos/ryantm/agenix/tarball/0.15.0",
"hash": "01dhrghwa7zw93cybvx4gnrskqk97b004nfxgsys0736823956la" "hash": "01dhrghwa7zw93cybvx4gnrskqk97b004nfxgsys0736823956la"
}, },
"ai-blocklist": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "laylavish",
"repo": "uBlockOrigin-HUGE-AI-Blocklist"
},
"branch": "main",
"submodules": false,
"revision": "9bb188e2701138e03f73bacebd6b19b181ca0012",
"url": "https://github.com/laylavish/uBlockOrigin-HUGE-AI-Blocklist/archive/9bb188e2701138e03f73bacebd6b19b181ca0012.tar.gz",
"hash": "0h318ckx8l89bff1fv4xg6mmhkvpfhyhvzbr0iyaa7q3dx3iyz57",
"frozen": true
},
"disko": { "disko": {
"type": "GitRelease", "type": "GitRelease",
"repository": { "repository": {
@ -105,20 +91,6 @@
"hash": "0g4izwn5k7qpavlk3w41a92rhnp4plr928vmrhc75041vzm3vb1l", "hash": "0g4izwn5k7qpavlk3w41a92rhnp4plr928vmrhc75041vzm3vb1l",
"frozen": true "frozen": true
}, },
"hategroup-blocklist": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "chigh",
"repo": "hategroup-dnsbl"
},
"branch": "master",
"submodules": false,
"revision": "cc19c050997d5f54014bb20c764b131e003dfb17",
"url": "https://github.com/chigh/hategroup-dnsbl/archive/cc19c050997d5f54014bb20c764b131e003dfb17.tar.gz",
"hash": "1x1nhy0717bav35z6aid0224izmcsrg3knys64xszhslh266p429",
"frozen": true
},
"hategroup-dnsbl": { "hategroup-dnsbl": {
"type": "Git", "type": "Git",
"repository": { "repository": {