all repos — nixfiles @ 0b446897e178560307fceecb1ac6a1ab08ebf8ee

System and user configuration, managed by nix and home-manager

Split network-manager and kresd

Alan Pearce
commit

0b446897e178560307fceecb1ac6a1ab08ebf8ee

parent

ce2c59088a85f960fde8f0446580ea5f3b8ace8f

2 files changed, 26 insertions(+), 18 deletions(-)

changed files
M system/settings/hardware/network-manager.nixsystem/settings/hardware/network-manager.nix
@@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: -let - nextdnsConfig = "abd6e5"; - hostname = config.networking.hostName; -in { + imports = [ + "../services/kresd.nix"; + ]; + networking = { networkmanager = { enable = true;
@@ -15,20 +15,6 @@ useLocalResolver = true;
}; }; - services.kresd = { - enable = true; - extraConfig = '' - cache.size = 100*MB - cache.min_ttl(3 * 3600) - - policy.add(policy.all(policy.TLS_FORWARD({ - {'45.90.28.0', hostname='${hostname}-${nextdnsConfig}.dns1.nextdns.io'}, - {'2a07:a8c0::', hostname='${hostname}-${nextdnsConfig}.dns1.nextdns.io'}, - {'45.90.30.0', hostname='${hostname}-${nextdnsConfig}.dns2.nextdns.io'}, - {'2a07:a8c1::', hostname='${hostname}-${nextdnsConfig}.dns2.nextdns.io'} - }))) - ''; - }; environment.systemPackages = with pkgs; [ networkmanagerapplet networkmanager_dmenu
A system/settings/services/kresd.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }: + +let + nextdnsConfig = "abd6e5"; + hostname = config.networking.hostName; +in +{ + services.kresd = { + enable = true; + extraConfig = '' + cache.size = 100*MB + cache.min_ttl(3 * 3600) + + policy.add(policy.all(policy.TLS_FORWARD({ + {'45.90.28.0', hostname='${hostname}-${nextdnsConfig}.dns1.nextdns.io'}, + {'2a07:a8c0::', hostname='${hostname}-${nextdnsConfig}.dns1.nextdns.io'}, + {'45.90.30.0', hostname='${hostname}-${nextdnsConfig}.dns2.nextdns.io'}, + {'2a07:a8c1::', hostname='${hostname}-${nextdnsConfig}.dns2.nextdns.io'} + }))) + ''; + }; +}