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,
pkgs,
...
}: let
inherit (pkgs.stdenv.hostPlatform) isLinux;
in {
services =
{
dnsmasq =
if isLinux
then {
enable = true;
servers = [
"::1#53000"
"127.0.0.1#53000"
];
extraConfig = ''
# stubby
no-resolv
proxy-dnssec
listen-address=::1,127.0.0.1
}: {
services = {
dnsmasq = {
enable = true;
servers = [
"::1#53000"
"127.0.0.1#53000"
];
extraConfig = ''
# stubby
no-resolv
proxy-dnssec
listen-address=::1,127.0.0.1
# loopback for development
address=/test/127.0.0.1
'';
}
# nix-darwin config
else {
enable = true;
addresses."test" = "127.0.0.1";
bind = "127.0.0.1";
};
}
// (
if isLinux
then {
mullvad-vpn = {
enable = true;
};
stubby = {
enable = true;
settings = {
resolution_type = "GETDNS_RESOLUTION_STUB";
listen_addresses = ["127.0.0.1@53000" "0::1@53000"];
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 {}
);
# loopback for development
address=/test/127.0.0.1
'';
};
mullvad-vpn = {
enable = true;
};
stubby = {
enable = true;
settings = {
resolution_type = "GETDNS_RESOLUTION_STUB";
listen_addresses = ["127.0.0.1@53000" "0::1@53000"];
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";
}
];
};
};
};
}

5
machines/sashimi/default.nix
View file

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