diff --git a/profiles/dnscrypt/cloaking_rules b/profiles/dns/cloaking_rules similarity index 100% rename from profiles/dnscrypt/cloaking_rules rename to profiles/dns/cloaking_rules diff --git a/profiles/dnscrypt/default.nix b/profiles/dns/default.nix similarity index 81% rename from profiles/dnscrypt/default.nix rename to profiles/dns/default.nix index a11d442..c951418 100644 --- a/profiles/dnscrypt/default.nix +++ b/profiles/dns/default.nix @@ -2,10 +2,8 @@ networking = { nameservers = [ "127.0.0.1" "::1" ]; resolvconf.useLocalResolver = true; - # If using dhcpcd: - dhcpcd.extraConfig = "nohook resolv.conf"; # If using NetworkManager: - networkmanager.dns = "none"; +# networkmanager.dns = "none"; }; services.dnscrypt-proxy2 = { enable = true; @@ -19,7 +17,7 @@ "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md" "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md" ]; - cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md"; + cache_file = "/var/lib/dnscrypt-proxy/public-resolvers.md"; minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"; }; }; diff --git a/suites/default.nix b/suites/default.nix index 36eacd7..15ae130 100644 --- a/suites/default.nix +++ b/suites/default.nix @@ -1,6 +1,6 @@ { profiles, ... }: with profiles; rec { - base = [ users.root core dnscrypt ]; + base = [ users.root core dns ]; workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix tailscale users.mae ]; desktop = workstation ++ [ amd three_dee ]; lap = workstation ++ [ laptop bluetooth print ];