Revert "firefox: allow unloading Privacy Badger (although unlikely to stay unloaded due to widget replacements)"

This reverts commit 4701d2be6c87ef6723e708f10a42083c850b4fdc.

.mikaela/motivational-message.txt

@@ -1,27 +1,49 @@
+# This file is read by my {zsh,bash}rc if current user is either aminda
+# or mikaela, or alternatively something hardware specific such as deck.
+# The reading command is:
+# tail -n +1 $HOME/.shell-things/.mikaela/motivational-message.txt | grep -v '#'
+# Older motivational messages are stored in case bringing them back is
+# desired later. Don't forget, this is a living document.
 
-# Motivational messages
+Aferoj emas funkcii sin mem...  OM MANI PEME HUNG...
 # Tavun OM värähtely poistaa ylpeyttä, MA kateutta, NI takertumista. PE
 # leikkaa tietämättömyyden läpi, ME hälventää ahneuden ja rintakehässä
 # värähtelevä HUNG muuntaa vihan.
 #   Kuinka asiat ovat (s. 74-75) - Lama Ole Nydahl
-Aferoj emas funkcii sin mem...  OM MANI PEME HUNG...
+#
-# Illusions I & II - Richard Bach
 # Here is a test to find whether your mission on earth is finished:
 #   If you’re alive, it isn’t.
 # You are a perfect expression of perfect Love, here and now.
+# Illusions I & II - Richard Bach
 
-      Memoru ankauh
+  "They say that I must learn to kill before I can feel safe. But I,
-  - Know fear. Face fears. Don't obey in advance! Fluff the SPOTLIGHT
+    I'd rather kill myself then turn into their slave."
-    EFFECT! Break the SPIRAL OF SILENCE!
+# The Rasmus: In the Shadows
-    - Be the gay propawganda they are so afraid of! Wear pride, be
+
-      genderqueer, unshaved, unashamedly braless!
+MEMENTO VIVERE! Advice, total nonsense or something between:
-  - Act Like You Belong. And you shall belong.
+
-  - Leave the world a better place than you found it. Remember
+* Stand out! Otherwise there is no diversity, no comfort zone, just
-    EMPATHY, SYMPATHY and COMPASSION! Let them lead you to KINDNESS!
+  nazis as not standing out means obeying in advance. Act Like You
-    - Remember your own boundaries too, you too are allowed to say no
+  Belong and Belong You Shall.
-      and continue walking past without explaining yourself! They are
+* Know fear. Face {it,them}. Break the Spiral of Silence. "Fear is the
-      afraid of your judgment too employed right now or not.
+  tool of tyrants"
-- May your heart be your guiding key ;)
+  * Be their fears. Queer propawganda to remind them we are people.
-- MEMENTO VIVERE
+    Naturist to remind they are the same as us under their covers.
+#      Memoru ankauh
+#  - Know fear. Face fears. Don't obey in advance! Fluff the SPOTLIGHT
+#    EFFECT! Break the SPIRAL OF SILENCE!
+#    - Be the gay propawganda they are so afraid of! Wear pride, be
+#      genderqueer, unshaved, unashamedly braless!
+#  - Act Like You Belong. And you shall belong.
+* Leave the world a better place than you found it. Remember
+  EMPATHY, SYMPATHY and COMPASSION! Let them lead you to KINDNESS!
+  * Remember them towards everyone. Everyone includes you. Respect your
+    boundaries as well, you can say "no" and continue your path without
+    explanations.
+#    - Remember your own boundaries too, you too are allowed to say no
+#      and continue walking past without explaining yourself! They are
+#      afraid of your judgment too employed right now or not.
+* May your heart be your guiding key ;)
+#
+#Make your tech grayscale painting your life with colours
 
-Make your tech grayscale painting your life with colours

etc/firefox/policies/policies.json

@@ -2,93 +2,7 @@
 	"policies": {
 		"3rdparty": {
 			"Extensions": {
-				"jid1-MnnxcxisBPnSXQ@jetpack": {
+				"adnauseam@rednoise.org": {
-					"checkForDNTPolicy": true,
-					"disabledSites": [
-						"www.ecosia.org",
-						"pp-attester-turnstile.research.cloudflare.com"
-					],
-					"learnInIncognito": true,
-					"learnLocally": true,
-					"sendDNTSignal": true,
-					"showCounter": true,
-					"showIntroPage": false,
-					"socialWidgetReplacementEnabled": true,
-					"trackingDomains": [
-						{
-							"domain": "tunnus.almamedia.fi",
-							"action": "cookieblock"
-						},
-						{
-							"domain": "bitwarden.eu",
-							"action": "allow"
-						},
-						{
-							"domain": "google.com",
-							"action": "block"
-						},
-						{
-							"domain": "recaptcha.net",
-							"action": "block"
-						},
-						{
-							"domain": "vimeo.com",
-							"action": "block"
-						},
-						{
-							"domain": "vimeocdn.com",
-							"action": "block"
-						},
-						{
-							"domain": "youtube.com",
-							"action": "block"
-						},
-						{
-							"domain": "youtube-nocookie.com",
-							"action": "block"
-						}
-					]
-				},
-				"jid1-ZAdIEUB7XOzOJw@jetpack": {
-					"hasSeenPostInstall": true
-				},
-				"uBOLiteRedux@raymondhill.net": {
-					"defaultFiltering": "basic",
-					"disableFirstRunPage": true,
-					"noFiltering": [
-						"-all-urls",
-						"accountscenter.facebook.com",
-						"accountscenter.instagram.com",
-						"accounts.google.com",
-						"auth-prod.megical.com",
-						"challenges.cloudflare.com",
-						"chrome-extension-scheme",
-						"kansalainen.kanta.fi",
-						"kanta.fi",
-						"klarna.com",
-						"moz-extension-scheme",
-						"myaccount.google.com",
-						"omakanta.kanta.fi",
-						"oma.kela.fi",
-						"omavero.vero.fi",
-						"pp-attester-turnstile.research.cloudflare.com",
-						"research.cloudflare.com",
-						"suomi.fi",
-						"tunnistautuminen.suomi.fi",
-						"tunnistus.telia.fi",
-						"www.ecosia.org",
-						"www.npmjs.com",
-						"www.suomi.fi"
-					],
-					"rulesets": [
-						"-*",
-						"+default",
-						"+block-lan",
-						"+fin-0"
-					],
-					"showBlockedCount": true
-				},
-				"uBlock0@raymondhill.net": {
 					"advancedSettings": [
 						[
 							"filterAuthorMode",
@@ -147,7 +61,11 @@
 							"ublock-filters",
 							"ublock-privacy",
 							"ublock-quick-fixes",
-							"ublock-unbreak"
+							"ublock-unbreak",
+							"user-filters",
+							"adnauseam-filters",
+							"easyprivacy",
+							"urlhaus-1"
 						]
 					},
 					"userSettings": [
@@ -185,6 +103,56 @@
 						]
 					]
 				},
+				"jid1-MnnxcxisBPnSXQ@jetpack": {
+					"checkForDNTPolicy": true,
+					"disabledSites": [
+						"www.ecosia.org",
+						"pp-attester-turnstile.research.cloudflare.com"
+					],
+					"learnInIncognito": true,
+					"learnLocally": true,
+					"sendDNTSignal": true,
+					"showCounter": true,
+					"showIntroPage": false,
+					"socialWidgetReplacementEnabled": true,
+					"trackingDomains": [
+						{
+							"domain": "tunnus.almamedia.fi",
+							"action": "cookieblock"
+						},
+						{
+							"domain": "bitwarden.eu",
+							"action": "allow"
+						},
+						{
+							"domain": "google.com",
+							"action": "block"
+						},
+						{
+							"domain": "recaptcha.net",
+							"action": "block"
+						},
+						{
+							"domain": "vimeo.com",
+							"action": "block"
+						},
+						{
+							"domain": "vimeocdn.com",
+							"action": "block"
+						},
+						{
+							"domain": "youtube.com",
+							"action": "block"
+						},
+						{
+							"domain": "youtube-nocookie.com",
+							"action": "block"
+						}
+					]
+				},
+				"jid1-ZAdIEUB7XOzOJw@jetpack": {
+					"hasSeenPostInstall": true
+				},
 				"{446900e4-71c2-419f-a6a7-df9c091e268b}": {
 					"environment": {
 						"base": "https://vault.bitwarden.eu",
@@ -245,8 +213,8 @@
 				"https://www.ecosia.org",
 				"https://pp-attester-turnstile.research.cloudflare.com"
 			],
-			"Locked": false,
+			"Locked": true,
-			"Value": true
+			"Value": false
 		},
 		"EncryptedMediaExtensions": {
 			"Enabled": false,
@@ -288,6 +256,14 @@
 				"installation_mode": "allowed",
 				"private_browsing": true
 			},
+			"adnauseam@rednoise.org": {
+				"blocked_install_message": "AdNauseam",
+				"default_area": "navbar",
+				"install_url": "https://addons.mozilla.org/firefox/downloads/latest/adnauseam/latest.xpi",
+				"installation_mode": "force_installed",
+				"private_browsing": true,
+				"restricted_domains": []
+			},
 			"chrome-mask@overengineer.dev": {
 				"blocked_install_message": "Chrome Mask",
 				"default_area": "navbar",
@@ -395,7 +371,7 @@
 			"uBOLiteRedux@raymondhill.net": {
 				"blocked_install_message": "uBlock Origin Lite. Self-distributed",
 				"default_area": "navbar",
-				"installation_mode": "allowed",
+				"installation_mode": "blocked",
 				"private_browsing": true,
 				"restricted_domains": []
 			},
@@ -403,7 +379,7 @@
 				"blocked_install_message": "uBlock Origin",
 				"default_area": "navbar",
 				"install_url": "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi",
-				"installation_mode": "normal_installed",
+				"installation_mode": "blocked",
 				"private_browsing": true,
 				"restricted_domains": []
 			},
@@ -635,7 +611,7 @@
 			"browser.contentblocking.category": {
 				"Status": "locked",
 				"Type": "string",
-				"Value": "strict"
+				"Value": "standard"
 			},
 			"browser.contentblocking.report.hide_vpn_banner": {
 				"Status": "default",

etc/systemd/system/socket.d/freebind.conf

@@ -0,0 +1,2 @@
+[Socket]
+FreeBind=true

etc/systemd/system/socket.d/upheld.conf

@@ -0,0 +1,3 @@
+# https://github.com/systemd/systemd/issues/11553#issuecomment-1700933643
+[Install]
+UpheldBy=sockets.target

install

@@ -174,7 +174,7 @@ if [ "$(id -u)" == "0" ]; then
 	mkdir -vp /etc/systemd/system/{ssh,sshd,oidentd}.socket.d/
 	# SECURITY WARNING!
 	cp -v etc/systemd/system/service.d/rngd-wanted.conf /etc/systemd/system/service.d/
-	cp -v etc/systemd/system/socket.d/dualstack-bind.conf /etc/systemd/system/socket.d/
+	cp -v etc/systemd/system/socket.d/{dualstack-bind,freebind,upheld}.conf /etc/systemd/system/socket.d/
 	# SECURITY WARNING!
 	cp -v etc/systemd/system/service.d/never-fail.conf /etc/systemd/system/ssh.service.d/
 	cp -v etc/systemd/system/service.d/never-fail.conf /etc/systemd/system/sshd.service.d/
@@ -187,9 +187,10 @@ if [ "$(id -u)" == "0" ]; then
 	cp -v etc/systemd/system/service.d/never-fail.conf /etc/systemd/system/unbound.service.d/
 	cp -v etc/systemd/system/service.d/never-fail.conf /etc/systemd/system/tor.service.d/
 	cp -v etc/systemd/system/service.d/never-fail.conf /etc/systemd/system/yggdrasil.service.d/
-	cp -v etc/systemd/system/socket.d/dualstack-bind.conf /etc/systemd/system/ssh.socket.d/
+	#cp -v etc/systemd/system/socket.d/dualstack-bind.conf /etc/systemd/system/ssh.socket.d/
-	cp -v etc/systemd/system/socket.d/dualstack-bind.conf /etc/systemd/system/sshd.socket.d/
+	#cp -v etc/systemd/system/socket.d/dualstack-bind.conf /etc/systemd/system/sshd.socket.d/
-	cp -v etc/systemd/system/socket.d/dualstack-bind.conf /etc/systemd/system/oidentd.socket.d/
+	#cp -v etc/systemd/system/socket.d/dualstack-bind.conf /etc/systemd/system/oidentd.socket.d/
+	rm -v /etc/systemd/system/*.socket.d/dualstack-bind.conf
 
 	if hash systemctl 2> /dev/null; then
 		systemctl daemon-reload