fix(network): Add dns servers on the main interface

This commit is contained in:
Tom Hubrecht 2023-12-04 12:36:31 +01:00
parent 18030d22e8
commit b338eeed6a

View file

@ -1,16 +1,18 @@
{ config, lib, meta, name, ... }: { config, lib, meta, name, ... }:
let let
inherit (lib) inherit (lib) mapAttrs' mkEnableOption mkIf optionalAttrs;
mapAttrs'
mkEnableOption
mkIf
optionalAttrs;
net = meta.network.${name}; net = meta.network.${name};
mkAddress = { address, prefixLength, ... }: "${address}/${builtins.toString prefixLength}"; mkAddress = { address, prefixLength, ... }:
mkRoute = gateway: { routeConfig = { Gateway = gateway; GatewayOnLink = true; }; }; "${address}/${builtins.toString prefixLength}";
mkRoute = gateway: {
routeConfig = {
Gateway = gateway;
GatewayOnLink = true;
};
};
mkInterface = interface: net: { mkInterface = interface: net: {
name = "10-${interface}"; name = "10-${interface}";
@ -19,15 +21,29 @@ let
address = builtins.map mkAddress (net.ipv4 ++ net.ipv6); address = builtins.map mkAddress (net.ipv4 ++ net.ipv6);
routes = builtins.map mkRoute net.gateways; routes = builtins.map mkRoute net.gateways;
# Add default DNS servers
dns = [
"1.1.1.1#cloudflare-dns.com"
"8.8.8.8#dns.google"
"1.0.0.1#cloudflare-dns.com"
"8.8.4.4#dns.google"
"[2606:4700:4700::1111]#cloudflare-dns.com"
"[2001:4860:4860::8888]#dns.google"
"[2606:4700:4700::1001]#cloudflare-dns.com"
"[2001:4860:4860::8844]#dns.google"
];
networkConfig = optionalAttrs (net ? DHCP) { inherit (net) DHCP; }; networkConfig = optionalAttrs (net ? DHCP) { inherit (net) DHCP; };
}; };
}; };
cfg = config.dgn-network; cfg = config.dgn-network;
in
{ in {
options.dgn-network.enable = mkEnableOption "automatic network configuration based on metadata" // { default = true; }; options.dgn-network.enable =
mkEnableOption "automatic network configuration based on metadata" // {
default = true;
};
config = mkIf cfg.enable { config = mkIf cfg.enable {
networking = { networking = {