diff --git a/nixos-configurations/orangepihole.nix b/nixos-configurations/orangepihole.nix index 1763e68..d362718 100644 --- a/nixos-configurations/orangepihole.nix +++ b/nixos-configurations/orangepihole.nix @@ -63,13 +63,13 @@ ]; }; }; - mainInterface = "40-end0"; + mainInterface = "end0"; networking = { hostName = "orangepihole"; # Define your hostname. useDHCP = lib.mkDefault true; }; - systemd.network.networks."40-end0" = { + systemd.network.networks."end0" = { matchConfig.Name = "end0"; address = [ "10.42.69.2/24" @@ -77,7 +77,7 @@ ]; dns = [ "10.42.69.2" - "fd72:3dd5:21ae:3c97::2" + "10.42.69.100" ]; domains = [ "icanttype.org" ]; gateway = [ "10.42.69.1" ]; diff --git a/nixos-configurations/zeus.nix b/nixos-configurations/zeus.nix index 6929af8..0144120 100644 --- a/nixos-configurations/zeus.nix +++ b/nixos-configurations/zeus.nix @@ -182,7 +182,7 @@ in "10.42.69.100/24" "fd72:3dd5:21ae:3c97:101b:87ff:fe86:5f01/64" ]; - dns = [ "10.42.69.2" ]; + dns = [ "10.42.69.100" "10.42.69.2" ]; domains = [ "icanttype.org" ]; gateway = [ "10.42.69.1" ]; dhcpServerConfig = { @@ -243,6 +243,7 @@ in "/etc/containers/networks" ]; files = [ + "/etc/unbound/ads.conf" "/etc/machine-id" "/etc/adjtime" "/etc/ssh/ssh_host_rsa_key" diff --git a/nixos-modules/unbound.nix b/nixos-modules/unbound.nix index 89bf026..e614f24 100644 --- a/nixos-modules/unbound.nix +++ b/nixos-modules/unbound.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: { systemd = { services.adblock = { @@ -36,7 +36,7 @@ server = { do-ip6 = "no"; qname-minimisation = "yes"; - # interface = [ "end0" ]; + interface = [ config.mainInterface ]; access-control = [ "10.0.0.0/8 allow" "fc::/7 allow"