firefox: switch back to EFF Privacy Badger [from AMO]

This reverts commit a4695b95f49ea0671dc24d31006130b64bbb99d4.

conf/firefox-forbidden-policies.js

@@ -79,7 +79,7 @@ lockPref("privacy.donottrackheader.value", 1);
 lockPref("privacy.fingerprintingProtection", true);
 // Somehow I cannot clearPref this, so...
 //clearPref("privacy.fingerprintingProtection");
-lockPref("privacy.fingerprintingProtection", false);
+//lockPref("privacy.fingerprintingProtection", false);
 pref(
 	"privacy.fingerprintingProtection.overrides",
 	"+AllTargets,-KeyboardEvents,-SpeechSynthesis,-CSSPrefersColorScheme,-CSSPrefersReducedMotion,-NavigatorUserAgent,-JSDateTimeUTC,-HttpUserAgent",

etc/NetworkManager/conf.d/connectivity.conf

@@ -1,12 +1,17 @@
 [connectivity]
 uri=http://nmcheck.gnome.org/check_network_status.txt
-interval=100
+interval=300
 
 # Expect "NetworkManager is online" to check for captive portals.
 
 # Debian: don't bother with this file,
 # sudo apt install network-manager-config-connectivity-debian
 # for /usr/lib/NetworkManager/conf.d/20-connectivity-debian.conf
-# (http://network-test.debian.org/nm without interval)
+# (http://network-test.debian.org/nm without interval default 300)
+
+# Fedora: don't bother with this file here either,
+# sudo dnf install NetworkManager-config-connectivity-fedora
+# for /usr/lib/NetworkManager/conf.d/20-connectivity-fedora.conf
+# (http://fedoraproject.org/static/hotspot.txt interval 300)
 
 # vim: filetype=NetworkManager.conf

etc/firefox/policies/policies.json

@@ -2,7 +2,7 @@
   "policies": {
     "3rdparty": {
       "Extensions": {
-        "jid1-MnnxcxisBPnSXQ@jetpack": {
+        "jid1-MnnxcxisBPnSXQ-eff@jetpack": {
           "checkForDNTPolicy": true,
           "disabledSites": [
             "challenges.cloudflare.com",
@@ -142,10 +142,16 @@
         "install_url": "https://addons.mozilla.org/firefox/downloads/latest/multi-account-container/latest.xpi",
         "installation_mode": "force_installed"
       },
-      "jid1-MnnxcxisBPnSXQ@jetpack": {
-        "install_url": "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi",
+      "jid1-MnnxcxisBPnSXQ-eff@jetpack": {
+        "comment": "While this won't sync and requires manually enabling the other one when the policy is missing, it's less confusing for the automatic configuration not existing. Additionally I have some suspicion towards Mozilla Anonym.",
+        "install_url": "https://www.eff.org/files/privacy-badger-latest.xpi",
         "installation_mode": "force_installed"
       },
+      "jid1-MnnxcxisBPnSXQ@jetpack": {
+        "blocked_install_message": "Already force_installed through EFF.",
+        "install_url": "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi",
+        "installation_mode": "blocked"
+      },
       "offline-qr-code@rugk.github.io": {
         "install_url": "https://addons.mozilla.org/firefox/downloads/latest/offline-qr-code-generator/latest.xpi",
         "installation_mode": "force_installed"
@@ -554,15 +560,11 @@
         "Value": 0
       },
       "geo.provider.network.url": {
-        "Status": "default",
+        "Comment": "Firefox only sends connected AP that won't work due to _nomap and the server side requires more than one as well. beacondb/beacondb#8",
+        "Status": "clear",
         "Type": "string",
         "Value": "https://beacondb.net/v1/geolocate"
       },
-      "geo.provider.use_geoclue": {
-        "Status": "locked",
-        "Type": "boolean",
-        "Value": false
-      },
       "image.animation.mode": {
         "Comment": "Preference not allowed for stability reasons. :(",
         "Status": "default",

etc/geoclue/conf.d/beacondb.conf

@@ -0,0 +1,7 @@
+# Attempt to use beacondb.net with geoclue. However as I use Sway and I
+# don't use .desktop files, nothing has permission to access geoclue and I
+# have thus disabled it, but maybe on Plasma, family PC, or just in case this
+# should be noted.
+[wifi]
+enable=true
+url=https://beacondb.net/v1/geolocate