Add Spotify search to Librewolf, remove redundant Grub device option, first attempt at DNS adblocking

hosts/midas/services/default.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   services = {
+    blocky.enable = true;
     cloudflare-dyndns.enable = true;
     forgejo.enable = true;
     icecast.enable = true;

hosts/qemu/boot/default.nix

@@ -2,9 +2,6 @@
 {
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    loader.grub = {
+    loader.grub.enable = true;
-      enable = true;
-      device = lib.mkForce "/dev/vda";
-    };
   };
 }

modules/home/programs/gui/librewolf/default.nix

@@ -52,68 +52,59 @@
             "NixPKGs"
             "MyNixOS"
             "YouTube"
+	    "Spotify"
           ];
           engines = {
             "Ecosia" = {
-              urls = [
+              urls = [{
-                {
+                template = "https://www.ecosia.org/search";
-                  template = "https://www.ecosia.org/search";
+                params = [{
-                  params = [
+                  name = "q";
-                    {
+                  value = "{searchTerms}";
-                      name = "q";
+                }];
-                      value = "{searchTerms}";
+              }];
-                    }
-                  ];
-                }
-              ];
               definedAliases = [ "@e" ];
             };
             "NixPKGs" = {
-              urls = [
+              urls = [{
-                {
+                template = "https://search.nixos.org/packages";
-                  template = "https://search.nixos.org/packages";
+                params = [
-                  params = [
+                  {
-                    {
+                    name = "type";
-                      name = "type";
+                    value = "packages";
-                      value = "packages";
+                  }
-                    }
+                  {
-                    {
+                    name = "query";
-                      name = "query";
+                    value = "{searchTerms}";
-                      value = "{searchTerms}";
+                  }
-                    }
+                ];
-                  ];
+              }];
-                }
+              definedAliases = [ "@pkgs" ];
-              ];
-              definedAliases = [ "@p" ];
             };
             "MyNixOS" = {
-              urls = [
+              urls = [{
-                {
+                template = "https://mynixos.com/search";
-                  template = "https://mynixos.com/search";
+                params = [{
-                  params = [
+                  name = "q";
-                    {
+                  value = "{searchTerms}";
-                      name = "q";
+                }];
-                      value = "{searchTerms}";
+              }];
-                    }
-                  ];
-                }
-              ];
               definedAliases = [ "@my" ];
             };
             "YouTube" = {
-              urls = [
+              urls = [{
-                {
+                template = "https://www.youtube.com/results";
-                  template = "https://www.youtube.com/results";
+                params = [{
-                  params = [
+                  name = "search_query";
-                    {
+                  value = "{searchTerms}";
-                      name = "search_query";
+                }];
-                      value = "{searchTerms}";
+              }];
-                    }
-                  ];
-                }
-              ];
               definedAliases = [ "@y" ];
             };
+            "Spotify" = {
+              urls = [{ template = "https://open.spotify.com/search/{searchTerms}"; }];
+              definedAliases = [ "@s" ];
+            };
           };
         };
         commonBookmarks = [
@@ -192,7 +183,6 @@
           "privacy.resistFingerprinting" = true;
           "privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = true;
           "privacy.fingerprintingProtection" = true;
-          "privacy.donottrackheader.enabled" = true;
           "privacy.globalprivacycontrol.enabled" = true;
           "privacy.globalprivacycontrol.functionality.enabled" = true;
           "privacy.clearOnShutdown.cookies" = false;
@@ -256,6 +246,7 @@
         };
       };
     };
+
     # Symlinks to Librewolf
     home.file.".librewolf".source = config.lib.file.mkOutOfStoreSymlink "/home/${config.home.username}/.mozilla/firefox";
   };

modules/system/devices/boot/grub/default.nix

@@ -3,6 +3,5 @@
   boot.loader.grub = {
     efiSupport = true;
     efiInstallAsRemovable = true;
-    device = "nodev";
   };
 }

modules/system/devices/networking/default.nix

@@ -8,10 +8,10 @@
     nftables.enable = true;
     firewall.allowPing = false;
     nameservers = [
-      "9.9.9.11#dns11.quad9.net"
-      "149.112.112.11#dns11.quad9.net"
       "2620:fe::11#dns11.quad9.net"
       "2620:fe::fe:11#dns11.quad9.net"
+      "9.9.9.11#dns11.quad9.net"
+      "149.112.112.11#dns11.quad9.net"
     ];
   };
 

modules/system/services/server/blocky/default.nix

@@ -0,0 +1,29 @@
+{ config, ... }:
+{
+  services.blocky = {
+    settings = {
+      upstreams.groups.default = [
+	"2606:4700:4700::1111"
+	"2606:4700:4700::1001"
+        "1.1.1.1"
+	"1.0.0.1"
+      ];
+
+      blocking = {
+        clientGroupsBlock.default = [
+          "pro"
+          "tif"
+        ];
+        denylists = {
+          "pro" = [ "https://codeberg.org/hagezi/mirror2/raw/branch/main/dns-blocklists/wildcard/pro.txt" ];
+          "tif" = [ "https://codeberg.org/hagezi/mirror2/raw/branch/main/dns-blocklists/wildcard/tif.txt" ];
+        };
+      };
+
+      caching = {
+        prefetching = true;
+        minTime = "1m";
+      };
+    };
+  };
+}

modules/system/services/server/default.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   imports = [
+    ./blocky
     ./cfdyndns
     ./forgejo
     ./icecast