From 83ed191950a51d715e97fcd9d2b1975e61aa9d9b Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen@aminda.eu>
Date: Fri, 21 Mar 2025 09:23:15 +0200
Subject: [PATCH] {firefox,chromium}: prepare for return of NoScript

---
 etc/firefox/policies/policies.json                | 15 ++++++++-------
 .../policies/managed/aminda-extensions.json       |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/etc/firefox/policies/policies.json b/etc/firefox/policies/policies.json
index 92604871..769d2b1c 100644
--- a/etc/firefox/policies/policies.json
+++ b/etc/firefox/policies/policies.json
@@ -52,7 +52,7 @@
 					"advancedSettings": [
 						[
 							"filterAuthorMode",
-							"true"
+							"false"
 						],
 						[
 							"trustedListPrefixes",
@@ -121,7 +121,7 @@
 						],
 						[
 							"colorBlindFriendly",
-							"true"
+							"false"
 						],
 						[
 							"ignoreGenericCosmeticFilters",
@@ -223,10 +223,11 @@
 				"private_browsing": false
 			},
 			"CanvasBlocker@kkapsner.de": {
-				"comment": "Requested by LibreAwoo for those who don't have RFP/FPP, neither of which I can specify through this policy. Additionally its own description says compatible with the Firefox integrated one.",
+				"blocked_install_message": "Likely overlaps with JShelter in a negative way",
+				"comment": "Requested by LibreAwoo for those who don't have RFP/FPP, neither of which I can specify through this policy. Additionally its own description says compatible with the Firefox integrated one. Anyway I will probably unload it personally.",
 				"default_area": "menupanel",
 				"install_url": "https://addons.mozilla.org/firefox/downloads/latest/canvasblocker/latest.xpi",
-				"installation_mode": "normal_installed",
+				"installation_mode": "blocked",
 				"private_browsing": true,
 				"restricted_domains": []
 			},
@@ -286,7 +287,7 @@
 			"jsr@javascriptrestrictor": {
 				"default_area": "navbar",
 				"install_url": "https://addons.mozilla.org/firefox/downloads/latest/javascript-restrictor/latest.xpi",
-				"installation_mode": "normal_installed",
+				"installation_mode": "force_installed",
 				"private_browsing": true
 			},
 			"offline-qr-code@rugk.github.io": {
@@ -320,7 +321,7 @@
 			"uBlock0@raymondhill.net": {
 				"default_area": "navbar",
 				"install_url": "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi",
-				"installation_mode": "normal_installed",
+				"installation_mode": "force_installed",
 				"private_browsing": true,
 				"restricted_domains": []
 			},
@@ -434,7 +435,7 @@
 		"LegacySameSiteCookieBehaviorEnabled": false,
 		"NetworkPrediction": false,
 		"NewTabPage": true,
-		"OverrideFirstRunPage": "about:mozilla|https://github.com/gorhill/uBlock/wiki/Dynamic-filtering:-quick-guide",
+		"OverrideFirstRunPage": "about:mozilla|https://github.com/gorhill/uBlock/wiki/Dynamic-filtering:-quick-guide|https://addons.mozilla.org/firefox/addon/noscript/",
 		"PDFjs": {
 			"EnablePermissions": false,
 			"Enabled": true
diff --git a/etc/opt/chromium/policies/managed/aminda-extensions.json b/etc/opt/chromium/policies/managed/aminda-extensions.json
index d9ce9ddb..ad45e43f 100644
--- a/etc/opt/chromium/policies/managed/aminda-extensions.json
+++ b/etc/opt/chromium/policies/managed/aminda-extensions.json
@@ -11,7 +11,7 @@
 				"advancedSettings": [
 					[
 						"filterAuthorMode",
-						"true"
+						"false"
 					],
 					[
 						"trustedListPrefixes",
@@ -80,7 +80,7 @@
 					],
 					[
 						"colorBlindFriendly",
-						"true"
+						"false"
 					],
 					[
 						"ignoreGenericCosmeticFilters",
@@ -198,7 +198,7 @@
 			"update_url": "https://clients2.google.com/service/update2/crx"
 		},
 		"ammoloihpcbognfddfjcljgembpibcmb": {
-			"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"