vps-2024-05-31-13-02-21

configs/common.nix

@@ -16,30 +16,50 @@ in {
       openFirewall = true;
       extraConfig = "StreamLocalBindUnlink yes";
     };
-    nextdns = {
+    # nextdns = {
+    #   enable = true;
+    #   arguments = [
+    #     "-config"
+    #     secrets.nextdnshash
+    #     "-cache-size"
+    #     "10MB"
+    #     "-listen"
+    #     "127.0.0.1:53"
+    #     "-report-client-info"
+    #   ];
+    # };
+
+    dnscrypt-proxy2 = {
       enable = true;
-      arguments = [
-        "-config"
-        secrets.nextdnshash
-        "-cache-size"
-        "10MB"
-        "-listen"
-        "127.0.0.1:53"
-        "-report-client-info"
-      ];
+      settings = {
+        ipv6_servers = true;
+        require_dnssec = true;
+
+        sources.public-resolvers = {
+          urls = [
+            "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";
+          minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
+        };
+
+        # You can choose a specific set of servers from https://github.com/DNSCrypt/dnscrypt-resolvers/blob/master/v3/public-resolvers.md
+        # server_names = [ ... ];
+      };
     };
-    fwupd.enable = true;
+
     journald = { extraConfig = "SystemMaxUse=500M"; };
   };
 
   networking = {
     nameservers = [ "127.0.0.1" "::1" ];
-    hosts = {
-      "207.180.220.97" = [ "szczepan.ski" ];
-      "10.100.0.1" = [ "vps.wg" ];
-      "10.100.0.2" = [ "desktop.wg" ];
-      "10.100.0.3" = [ "mini.wg" ];
-    };
+    # hosts = {
+    #   "207.180.220.97" = [ "szczepan.ski" ];
+    #   "10.100.0.1" = [ "vps.wg" ];
+    #   "10.100.0.2" = [ "desktop.wg" ];
+    #   "10.100.0.3" = [ "mini.wg" ];
+    # };
     # If using dhcpcd:
     dhcpcd.extraConfig = "nohook resolv.conf";
     # If using NetworkManager:
@@ -53,6 +73,7 @@ in {
     btrfs-progs
     cargo
     dog
+    doggo # DNS Resolver
     du-dust
     duf
     gnupg
@@ -82,8 +103,6 @@ in {
     wget
   ];
 
-  documentation.enable = false;
-
   nix.settings = { auto-optimise-store = true; };
 
   boot = {
@@ -96,6 +115,6 @@ in {
   nix.gc = {
     automatic = true;
     dates = "weekly";
-    options = "--delete-older-than 30d";
+    options = "--delete-older-than 14d";
   };
 }