winston/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

fix(network): split network config to avoid inf recursion

Browse source
This commit is contained in:
winston 2023-03-01 20:47:27 +01:00
parent c95299669c
commit 78df3dc15b
Signed by: winston
GPG key ID: 3786770EDBC2B481
2 changed files with 45 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
machines/network.nix
View file

@ -2,62 +2,45 @@
lib, lib,
pkgs, pkgs,
... ...
}: let }: {
inherit (pkgs.stdenv.hostPlatform) isLinux; services = {
in { dnsmasq = {
services = enable = true;
{ servers = [
dnsmasq = "::1#53000"
if isLinux "127.0.0.1#53000"
then { ];
enable = true; extraConfig = ''
servers = [ # stubby
"::1#53000" no-resolv
"127.0.0.1#53000" proxy-dnssec
]; listen-address=::1,127.0.0.1
extraConfig = ''
# stubby
no-resolv
proxy-dnssec
listen-address=::1,127.0.0.1
# loopback for development # loopback for development
address=/test/127.0.0.1 address=/test/127.0.0.1
''; '';
} };
# nix-darwin config mullvad-vpn = {
else { enable = true;
enable = true; };
addresses."test" = "127.0.0.1"; stubby = {
bind = "127.0.0.1"; enable = true;
}; settings = {
} resolution_type = "GETDNS_RESOLUTION_STUB";
// ( listen_addresses = ["127.0.0.1@53000" "0::1@53000"];
if isLinux upstream_recursive_servers = [
then { {
mullvad-vpn = { address_data = "194.242.2.3";
enable = true; tls_port = 853;
}; tls_auth_name = "adblock.doh.mullvad.net";
stubby = { }
enable = true; {
settings = { address_data = "2a07:e340::3";
resolution_type = "GETDNS_RESOLUTION_STUB"; tls_port = 853;
listen_addresses = ["127.0.0.1@53000" "0::1@53000"]; tls_auth_name = "adblock.doh.mullvad.net";
upstream_recursive_servers = [ }
{ ];
address_data = "194.242.2.3"; };
tls_port = 853; };
tls_auth_name = "adblock.doh.mullvad.net"; };
}
{
address_data = "2a07:e340::3";
tls_port = 853;
tls_auth_name = "adblock.doh.mullvad.net";
}
];
};
};
}
else {}
);
} }

5
machines/sashimi/default.nix
View file

@ -29,5 +29,10 @@
services = { services = {
# Auto upgrade nix package and the daemon service. # Auto upgrade nix package and the daemon service.
nix-daemon.enable = true; nix-daemon.enable = true;
dnsmasq = {
enable = true;
addresses."test" = "127.0.0.1";
bind = "127.0.0.1";
};
}; };
} }