.pre-commit-config.yaml

@@ -52,9 +52,6 @@ repos:
       - id: mixed-line-ending
         args: [--fix=auto]
       - id: pretty-format-json
-        # Breaks AdNauseam/uBlock Origin rules as the browser interprets
-        # values to be set for empty options.
-        exclude: ^etc\/firefox\/policies\/policies.json|etc\/opt\/chromium\/policies\/managed\/aminda-extensions.json$
         args:
           # Remember also: --no-sort-keys
           # ASCII excludes the älphäbet amongst others

conf/librewolf.overrides.cfg

@@ -132,9 +132,7 @@ pref("browser.startup.homepage", "https://start.duckduckgo.com");
 
 // https://codeberg.org/librewolf/settings/src/branch/master/librewolf.cfg begins
 
-//pref("browser.contentblocking.category", "strict");
+pref("browser.contentblocking.category", "strict");
-// Aminda relies on AdNauseam
-lockPref("browser.contentblocking.category", "standard");
 pref("privacy.partition.always_partition_third_party_non_cookie_storage", true);
 pref("privacy.partition.always_partition_third_party_non_cookie_storage.exempt_sessionstorage", false);
 

etc/firefox/policies/policies.json

@@ -2,11 +2,6 @@
   "policies": {
     "3rdparty": {
       "Extensions": {
-        "adnauseam@rednoise.org": {
-          "advancedSettings": [
-            ["filterAuthorMode","true"]
-          ]
-        },
         "jid1-MnnxcxisBPnSXQ-eff@jetpack": {
           "learnInIncognito": true,
           "learnLocally": true,
@@ -33,7 +28,7 @@
       },
       "adnauseam@rednoise.org": {
         "install_url": "https://addons.mozilla.org/firefox/downloads/latest/adnauseam/latest.xpi",
-        "installation_mode": "force_installed"
+        "installation_mode": "normal_installed"
       },
       "jid0-3GUEt1r69sQNSrca5p8kx9Ezc3U@jetpack": {
         "install_url": "https://addons.mozilla.org/firefox/downloads/latest/terms-of-service-didnt-read/latest.xpi",
@@ -41,7 +36,7 @@
       },
       "jid1-MnnxcxisBPnSXQ-eff@jetpack": {
         "install_url": "https://www.eff.org/files/privacy-badger-latest.xpi",
-        "installation_mode": "normal_installed"
+        "installation_mode": "force_installed"
       },
       "jid1-ZAdIEUB7XOzOJw@jetpack": {
         "install_url": "https://addons.mozilla.org/firefox/downloads/latest/duckduckgo-for-firefox/latest.xpi",

etc/opt/chromium/policies/managed/aminda-extensions.json

@@ -1,11 +1,6 @@
 {
   "3rdparty": {
     "extensions": {
-      "mlojlfildnehdpnlmpkeiiglhhkofhpb": {
-          "advancedSettings": [
-            ["filterAuthorMode","true"]
-          ]
-        },
       "pkehgijcmpdhfbdbbnkijodmdjhbjlgp": {
         "learnInIncognito": true,
         "learnLocally": true,
@@ -71,7 +66,7 @@
       "update_url": "https://clients2.google.com/service/update2/crx"
     },
     "mlojlfildnehdpnlmpkeiiglhhkofhpb": {
-      "installation_mode": "force_installed",
+      "installation_mode": "normal_installed",
       "override_update_url": true,
       "toolbar_pin": "force_pinned",
       "update_url": "https://edge.microsoft.com/extensionwebstorebase/v1/crx"
@@ -83,7 +78,7 @@
       "update_url": "https://clients2.google.com/service/update2/crx"
     },
     "pkehgijcmpdhfbdbbnkijodmdjhbjlgp": {
-      "installation_mode": "normal_installed",
+      "installation_mode": "force_installed",
       "override_update_url": true,
       "toolbar_pin": "force_pinned",
       "update_url": "https://clients2.google.com/service/update2/crx"