summary refs log tree commit diff stats
path: root/system/settings/hardware/network-manager.nix
diff options
context:
space:
mode:
authorAlan Pearce2019-11-11 20:14:18 +0100
committerAlan Pearce2019-11-11 20:16:52 +0100
commit0b446897e178560307fceecb1ac6a1ab08ebf8ee (patch)
treeb4d657e6b45d21c6c3a6a28c515def5ff5a5efce /system/settings/hardware/network-manager.nix
parentce2c59088a85f960fde8f0446580ea5f3b8ace8f (diff)
downloadnixfiles-0b446897e178560307fceecb1ac6a1ab08ebf8ee.tar.lz
nixfiles-0b446897e178560307fceecb1ac6a1ab08ebf8ee.tar.zst
nixfiles-0b446897e178560307fceecb1ac6a1ab08ebf8ee.zip
Split network-manager and kresd
Diffstat (limited to 'system/settings/hardware/network-manager.nix')
-rw-r--r--system/settings/hardware/network-manager.nix22
1 files changed, 4 insertions, 18 deletions
diff --git a/system/settings/hardware/network-manager.nix b/system/settings/hardware/network-manager.nix
index 9b0e2532..ed4f5620 100644
--- a/system/settings/hardware/network-manager.nix
+++ b/system/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 @@ 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'}
-      })))
-    '';
-  };
   environment.systemPackages = with pkgs; [
     networkmanagerapplet
     networkmanager_dmenu