feat(oksys): use blocky instead of pihole
This commit is contained in:
parent
814e45ad22
commit
f98a72010a
5 changed files with 24 additions and 40 deletions
|
@ -4,9 +4,9 @@
|
|||
|
||||
../../modules/tailscale.nix
|
||||
|
||||
./modules/blocky.nix
|
||||
./modules/caddy.nix
|
||||
./modules/headscale.nix
|
||||
./modules/pihole.nix
|
||||
./modules/unbound.nix
|
||||
];
|
||||
|
||||
|
|
23
devices/oksys/modules/blocky.nix
Normal file
23
devices/oksys/modules/blocky.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{...}: {
|
||||
services = {
|
||||
blocky = {
|
||||
enable = true;
|
||||
settings = {
|
||||
upstream = {
|
||||
default = [
|
||||
"127.0.0.1:5335"
|
||||
"127.0.0.1:5335"
|
||||
];
|
||||
};
|
||||
|
||||
blocking = {
|
||||
blackLists = {
|
||||
ads = [
|
||||
"https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,39 +0,0 @@
|
|||
{pihole, ...}: {
|
||||
imports = [pihole.nixosModules.default];
|
||||
|
||||
services.pihole = {
|
||||
enable = true;
|
||||
|
||||
dnsPort = 53;
|
||||
webPort = 8080;
|
||||
|
||||
piholeConfig = {
|
||||
ftl = {
|
||||
# Defaults
|
||||
PRIVACYLEVEL = "0";
|
||||
RATE_LIMIT = "1000/60";
|
||||
};
|
||||
|
||||
interface = "tailscale0";
|
||||
|
||||
web = {
|
||||
theme = "default-darker";
|
||||
virtualHost = "pi.hole";
|
||||
password = "password";
|
||||
};
|
||||
|
||||
# Declaratively set the DNS settings
|
||||
# in Settings -> DNS -> Interface settings
|
||||
dnsmasq.extraConfig = ''
|
||||
interface=tailscale0
|
||||
except-interface=nonexisting
|
||||
'';
|
||||
|
||||
# Handle it with unbound
|
||||
dns.upstreamServers = [
|
||||
"127.0.0.1#5335"
|
||||
"127.0.0.1#5335"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
BIN
flake.nix
BIN
flake.nix
Binary file not shown.
Loading…
Reference in a new issue