From 1da3418afa389000e0aac67eb19471ef71c2213c Mon Sep 17 00:00:00 2001 From: RGBCube Date: Sun, 23 Feb 2025 15:18:14 +0300 Subject: [PATCH] fix: fix dns servers option --- modules/common/dns.nix | 4 ++-- modules/darwin/dns.nix | 2 +- modules/linux/resolved.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/common/dns.nix b/modules/common/dns.nix index 3b74eb8..c9ba904 100644 --- a/modules/common/dns.nix +++ b/modules/common/dns.nix @@ -1,14 +1,14 @@ { lib, ... }: let inherit (lib) mkConst; in { - options.networking.dns.servers = mkConst [ + options.dns.servers = mkConst [ "45.90.28.0#7f2bf8.dns.nextdns.io" "2a07:a8c0::#7f2bf8.dns.nextdns.io" "45.90.30.0#7f2bf8.dns.nextdns.io" "2a07:a8c1::#7f2bf8.dns.nextdns.io" ]; - options.networking.dns.serversFallback = mkConst [ + options.dns.serversFallback = mkConst [ "1.1.1.1#one.one.one.one" "2606:4700:4700::1111#one.one.one.one" diff --git a/modules/darwin/dns.nix b/modules/darwin/dns.nix index cd4c4a2..f5c37d2 100644 --- a/modules/darwin/dns.nix +++ b/modules/darwin/dns.nix @@ -3,7 +3,7 @@ in { # Yeah, no DNSSEC or DoT or anything. # That's what you get for using Darwin I guess. - networking.dns = config.networking.dns.servers + networking.dns = config.dns.servers |> map (splitString "#") |> map head; diff --git a/modules/linux/resolved.nix b/modules/linux/resolved.nix index c736bee..73f23d9 100644 --- a/modules/linux/resolved.nix +++ b/modules/linux/resolved.nix @@ -5,10 +5,10 @@ in { dnssec = "true"; dnsovertls = "true"; - extraConfig = config.networking.dns.servers + extraConfig = config.dns.servers |> map (server: "DNS=${server}") |> concatStringsSep "\n"; - fallbackDns = config.networking.dns.serversFallback; + fallbackDns = config.dns.serversFallback; }; }