From 9abf814126a531b27740b8e2b33e6ec3f5874fca Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Wed, 29 May 2024 09:04:11 +0300
Subject: [PATCH] DNS/blocklist: switch to ! for comments, block fonts, rename
 blocklist2 to more descriptive

---
 DNS/blocklist.txt               | 16 ++++++++--------
 DNS/blocklist2.txt              |  4 ----
 DNS/blocklists.ublockorigin.txt | 18 ++++++++++++++++++
 3 files changed, 26 insertions(+), 12 deletions(-)
 delete mode 100644 DNS/blocklist2.txt
 create mode 100644 DNS/blocklists.ublockorigin.txt

diff --git a/DNS/blocklist.txt b/DNS/blocklist.txt
index 2664280..ac9bbdd 100644
--- a/DNS/blocklist.txt
+++ b/DNS/blocklist.txt
@@ -1,12 +1,12 @@
-# Version: 202405282034
-# Description: Aminda gist blocklist test
-# Title: Aminda's small blocklist
-# Last modified: 2024-05-28T20:34:42+03:00
-# Expires: 24 hours
-# Syntax: Domains (wildcards)
-# License: CC-0
+! Version: 202405290901
+! Description: Aminda gist blocklist test
+! Title: Aminda's small blocklist
+! Last modified: 2024-05-29T09:01:33+03:00
+! Expires: 24 hours
+! Syntax: Domains (wildcards)
+! License: CC-0
 
-!#include blocklist2.txt
+!#include blocklist.ublockorigin.txt
 google-analytics.com
 *.google-analytics.com
 *.ssl.google-analytics.com
diff --git a/DNS/blocklist2.txt b/DNS/blocklist2.txt
deleted file mode 100644
index 3395940..0000000
--- a/DNS/blocklist2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# https://github.com/gorhill/uBlock/wiki/Static-filter-syntax
-#/detect-missing-adblocker@*.js*
-# https://github.com/gorhill/uBlock/wiki/Per-site-switches#no-remote-fonts
-*$font,third-party
diff --git a/DNS/blocklists.ublockorigin.txt b/DNS/blocklists.ublockorigin.txt
new file mode 100644
index 0000000..03bf8d4
--- /dev/null
+++ b/DNS/blocklists.ublockorigin.txt
@@ -0,0 +1,18 @@
+! https://github.com/gorhill/uBlock/wiki/Static-filter-syntax
+
+! Block third party fonts. Once I experience breakage, I will switch to the
+! second rule after which more breakage reports I will keep both commented.
+! However personally I am unlikely to see this as I keep changing font through
+! Dark Reader and OpenDyslexic extensions anyway...
+*$font
+
+! In case of issues add a custom filter `*$font,badfilter`
+
+! This suggests disabling only third party fonts
+! https://github.com/gorhill/uBlock/wiki/Per-site-switches#no-remote-fonts
+! NOTE that this doesn't seem to affect LocalCDN (which would mind first party
+! fonts being blocked though as it only cares about CDNs)
+!*$font,third-party
+
+! The above suggests `*$font,third-party,badfilter` possibly would override
+! this in custom rules.