voronind/nix
0
0
Fork 0
Code Issues 38 Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: voronind:198d2b5217a7c863709ca9ca377a85d3aa241de0
Branches Tags
voronind:main
..
compare: voronind:1662420bdc01e32ece0f904a58b28d3e28916dcf
Branches Tags
voronind:main

No commits in common. "198d2b5217a7c863709ca9ca377a85d3aa241de0" and "1662420bdc01e32ece0f904a58b28d3e28916dcf" have entirely different histories.
198d2b5217 ... 1662420bdc

3 changed files with 58 additions and 89 deletions
Show stats Expand all files Collapse all files

123
container/Dns.nix
View file

@ -3,109 +3,100 @@
pkgs, pkgs,
lib, lib,
config, config,
util,
... ...
}: }@args:
with lib;
let let
cfg = config.container.module.dns; cfg = config.container.module.dns;
in in
{ {
options = { options = {
container.module.dns = { container.module.dns = {
enable = lib.mkEnableOption "the DNS server."; enable = mkEnableOption "Dns server.";
address = lib.mkOption { address = mkOption {
default = "10.1.0.6"; default = "10.1.0.6";
type = lib.types.str; type = types.str;
}; };
port = lib.mkOption { port = mkOption {
default = 53; default = 53;
type = lib.types.int; type = types.int;
}; };
}; };
}; };
config = lib.mkIf cfg.enable { config = mkIf cfg.enable {
containers.dns = container.mkContainer cfg { containers.dns = container.mkContainer cfg {
config = config =
{ ... }: { ... }:
container.mkContainerConfig cfg { container.mkContainerConfig cfg {
environment.systemPackages = [ pkgs.cloudflared ]; environment.systemPackages = [ pkgs.cloudflared ];
# systemd.services.cloudflared = { systemd.services.cloudflared = {
# description = "Cloudflare DoH server."; description = "Cloudflare DoH server.";
# enable = true; enable = true;
# wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
# serviceConfig = { serviceConfig = {
# Type = "simple"; Type = "simple";
# ExecStart = "${lib.getExe pkgs.cloudflared} proxy-dns --port 5054"; ExecStart = "${getExe pkgs.cloudflared} proxy-dns --port 5054";
# }; };
# }; };
services.blocky = { services.blocky = {
enable = true; enable = true;
# SRC: https://0xerr0r.github.io/blocky/main/configuration/
settings = { settings = {
bootstrapDns = "tcp+udp:1.1.1.1"; upstream = {
connectIPVersion = "v4"; default = [
upstreams.groups = { "0.0.0.0:5054"
default = [ "https://dns.quad9.net/dns-query" ]; "0.0.0.0:5054"
}; ];
caching = {
maxItemsCount = 100000;
maxTime = "30m";
minTime = "5m";
prefetchExpires = "2h";
prefetchMaxItemsCount = 100000;
prefetchThreshold = 5;
prefetching = true;
}; };
blocking = { blocking = {
blockTTL = "1m"; blackLists = {
blockType = "zeroIP";
loading = {
refreshPeriod = "1h";
strategy = "blocking";
downloads = {
timeout = "5m";
attempts = 3;
cooldown = "10s";
};
};
# SRC: https://oisd.nl
# SRC: https://v.firebog.net
denylists = {
suspicious = [ suspicious = [
"https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts"
"https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhosts.txt" "https://raw.githubusercontent.com/PolishFiltersTeam/KADhosts/master/KADhosts.txt"
"https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts" # https://github.com/StevenBlack/hosts "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Spam/hosts"
"https://v.firebog.net/hosts/static/w3kbl.txt" "https://v.firebog.net/hosts/static/w3kbl.txt"
]; ];
ads = [ ads = [
"https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext" "https://easylist-downloads.adblockplus.org/bitblock.txt"
"https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts" "https://adaway.org/hosts.txt"
"https://v.firebog.net/hosts/AdguardDNS.txt" "https://v.firebog.net/hosts/AdguardDNS.txt"
"https://v.firebog.net/hosts/Admiral.txt" "https://v.firebog.net/hosts/Admiral.txt"
"https://raw.githubusercontent.com/anudeepND/blacklist/master/adservers.txt"
"https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt"
"https://v.firebog.net/hosts/Easylist.txt" "https://v.firebog.net/hosts/Easylist.txt"
"https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=0&mimetype=plaintext"
"https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts"
"https://raw.githubusercontent.com/bigdargon/hostsVN/master/hosts"
"https://github.com/easylist/ruadlist/blob/master/advblock/adservers.txt"
]; ];
tracking = [ tracking = [
"https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt"
"https://v.firebog.net/hosts/Easyprivacy.txt" "https://v.firebog.net/hosts/Easyprivacy.txt"
"https://v.firebog.net/hosts/Prigent-Ads.txt" "https://v.firebog.net/hosts/Prigent-Ads.txt"
"https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.2o7Net/hosts"
"https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
"https://hostfiles.frogeye.fr/firstparty-trackers-hosts.txt"
]; ];
malicious = [ malicious = [
"https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt" "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Alternate%20versions%20Anti-Malware%20List/AntiMalwareHosts.txt"
"https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt" "https://osint.digitalside.it/Threat-Intel/lists/latestdomains.txt"
"https://phishing.army/download/phishing_army_blocklist_extended.txt" "https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt"
"https://raw.githubusercontent.com/AssoEchap/stalkerware-indicators/master/generated/hosts"
"https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt"
"https://urlhaus.abuse.ch/downloads/hostfile/"
"https://v.firebog.net/hosts/Prigent-Crypto.txt" "https://v.firebog.net/hosts/Prigent-Crypto.txt"
"https://v.firebog.net/hosts/Prigent-Malware.txt" "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/add.Risk/hosts"
]; "https://bitbucket.org/ethanr/dns-blacklists/raw/8575c9f96e5b4a1308f2f12394abd86d0927a4a0/bad_lists/Mandiant_APT1_Report_Appendix_D.txt"
other = [ "https://phishing.army/download/phishing_army_blocklist_extended.txt"
"https://big.oisd.nl/domainswild" "https://gitlab.com/quidsup/notrack-blocklists/raw/master/notrack-malware.txt"
"https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser" "https://v.firebog.net/hosts/RPiList-Malware.txt"
"https://v.firebog.net/hosts/RPiList-Phishing.txt"
"https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt"
"https://raw.githubusercontent.com/AssoEchap/stalkerware-indicators/master/generated/hosts"
"https://urlhaus.abuse.ch/downloads/hostfile/"
]; ];
other = [ "https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser" ];
}; };
# allowlists = { # whiteLists = {
# other = [ # other = [
# "/.*.vk.com/" # "/.*.vk.com/"
# ]; # ];
@ -123,18 +114,20 @@ in
customDNS = { customDNS = {
mapping = mapping =
let let
block = host: { ${host} = "0.0.0.0"; }; block = "0.0.0.0";
in in
{ {
# All subdomains to current host. # All subdomains to current host.
# ${config.container.domain} = config.container.host; # ${config.container.domain} = config.container.host;
"voronind.com" = "10.0.0.1"; "voronind.com" = "10.0.0.1";
}
// block "gosuslugi.ru" # Blocklist.
// block "rutube.ru" "gosuslugi.ru" = block;
// block "vk.com"; "rutube.ru" = block;
"vk.com" = block;
};
}; };
ports.dns = cfg.port; port = cfg.port;
# httpPort = "80"; # httpPort = "80";
}; };
}; };

19
home/program/bash/module/Gpg.nix
View file

@ -73,24 +73,5 @@
_iterate_targets process ''${targets[@]} _iterate_targets process ''${targets[@]}
} }
# Find user keys using keyservers.
# Usage: gpg_find <EMAIL>
function gpg_find() {
local email="''${1}"
if [[ "''${email}" = "" ]]; then
help gpg_find
return 2
fi
gpg --locate-keys "''${email}" \
|| gpg --locate-keys --auto-key-locate hkps://keys.openpgp.org "''${email}"
}
# Update keys.
function gpg_refresh() {
gpg --refresh-keys
}
''; '';
} }

5
home/program/default.nix
View file

@ -8,11 +8,6 @@ in
gpg = { gpg = {
enable = true; enable = true;
inherit (secret.crypto) publicKeys; inherit (secret.crypto) publicKeys;
mutableKeys = true;
mutableTrust = true;
settings = {
keyserver = "hkps://keys.openpgp.org";
};
}; };
firefox = import ./firefox args; firefox = import ./firefox args;