diff --git a/modules/nixos/services/adguardhome.nix b/modules/nixos/services/adguardhome.nix index 61f50e6..f828d43 100644 --- a/modules/nixos/services/adguardhome.nix +++ b/modules/nixos/services/adguardhome.nix @@ -2,68 +2,65 @@ let service = config.unravelled.services.adguardhome or { }; in -{ - config = { - services.resolved.enable = lib.mkForce false; - } - // lib.mkIf (service.enable or false) { - networking = { - firewall = { - allowedTCPPorts = [ - service.port - 53 - ]; - allowedUDPPorts = [ 53 ]; - }; - nameservers = [ "127.0.0.1" ]; +lib.mkIf (service.enable or false) { + services.resolved.enable = lib.mkForce false; + + networking = { + firewall = { + allowedTCPPorts = [ + service.port + 53 + ]; + allowedUDPPorts = [ 53 ]; }; + nameservers = [ "127.0.0.1" ]; + }; - services.adguardhome = { - enable = true; - inherit (service) port; - settings = { - dns = { - enable_dnssec = true; - bootstrap_dns = [ - "9.9.9.10" - "149.112.112.10" - "2620:fe::10" - "2620:fe::fe:10" - ]; - upstream_dns = [ - "https://dns10.quad9.net/dns-query" - "https://dns.mullvad.net/dns-query" - "https://cloudflare-dns.com/dns-query" - ]; - }; - clients = { - runtime_sources = { - whois = true; - arp = true; - rdns = true; - dhcp = true; - hosts = true; - }; - persistent = [ ]; - }; - filtering = { - protection_enabled = true; - filtering_enabled = true; - parental_enabled = false; - safe_search.enabled = false; + services.adguardhome = { + enable = true; + inherit (service) port; + settings = { + dns = { + enable_dnssec = true; + bootstrap_dns = [ + "9.9.9.10" + "149.112.112.10" + "2620:fe::10" + "2620:fe::fe:10" + ]; + upstream_dns = [ + "https://dns10.quad9.net/dns-query" + "https://dns.mullvad.net/dns-query" + "https://cloudflare-dns.com/dns-query" + ]; + }; + clients = { + runtime_sources = { + whois = true; + arp = true; + rdns = true; + dhcp = true; + hosts = true; }; - user_rules = [ "@@||myip.wtf^" ]; - filters = - map - (url: { - inherit url; - enabled = true; - }) - [ - "https://adguardteam.github.io/HostlistsRegistry/assets/filter_49.txt" - "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt" - ]; + persistent = [ ]; + }; + filtering = { + protection_enabled = true; + filtering_enabled = true; + parental_enabled = false; + safe_search.enabled = false; }; + user_rules = [ "@@||myip.wtf^" ]; + filters = + map + (url: { + inherit url; + enabled = true; + }) + [ + "https://adguardteam.github.io/HostlistsRegistry/assets/filter_49.txt" + "https://adguardteam.github.io/HostlistsRegistry/assets/filter_1.txt" + ]; }; }; }