Compare commits

..

No commits in common. "889da57c3da2df6a35b477210195ecbabadb7bc0" and "4d1189791877acb4edd49cad5d8fc134d1bda63c" have entirely different histories.

10 changed files with 96 additions and 257 deletions

View File

@ -49,11 +49,15 @@ repos:
- id: fix-byte-order-marker
- id: mixed-line-ending
args: [--fix=auto]
- id: pretty-format-json
args:
# Remember also: --no-sort-keys
# ASCII excludes the älphäbet amongst others
[--autofix, --no-ensure-ascii]
# Remember to check that prettier excludes it, if used!
#- 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
#[--autofix, --no-ensure-ascii]
#- id: requirements-txt-fixer
# Synchronize dependencies between this file and package managers
@ -130,9 +134,8 @@ repos:
rev: "v3.2.5"
hooks:
- id: prettier
# These are handled by Black below or pretty-format-json above, which
# can also sort keys.
exclude_types: [python, pyi, jupyter, json]
# These are handled by Black below
exclude_types: [python, pyi, jupyter]
additional_dependencies: [
# https://www.npmjs.com/package/prettier
"prettier@3.2.5",
@ -140,8 +143,6 @@ repos:
"prettier-plugin-nginx@1.0.3",
# https://www.npmjs.com/package/prettier-plugin-toml
"prettier-plugin-toml@2.0.1",
# https://www.npmjs.com/package/prettier-plugin-sort-json
#"prettier-plugin-sort-json@4.0.0",
]
# Black, opinionated Python code formatter

View File

@ -1,8 +1,6 @@
// This file belongs to Firefox `default/pref` directory.
// E.g. /usr/lib64/firefox/defaults/pref/ or ~/.local/firefox/defaults/pref/
// WARNING: lockPref() IS NOT ALLOWED HERE!
// However the file below belongs to ../../ e.g. /usr/lib/64/firefox/ or
// ~/.local/firefox/
//pref("general.config.filename", "librewolf.overrides.cfg");

View File

@ -1,8 +1,5 @@
// This file belongs to Firefox `default/pref` directory as `autoconfig.js`.
// E.g. /usr/lib64/firefox/defaults/pref/autoconfig.js
// WARNING: lockPref() IS NOT ALLOWED HERE!
//pref("autoadmin.global_config_url","https://gitea.blesmrt.net/mikaela/shell-things/raw/branch/master/conf/firefox-forbidden-policies.js");
pref("autoadmin.global_config_url","file:///home/aminda/public_html/autoconfig.js");
pref("general.config.obscure_value", 0);

View File

@ -1,90 +1,63 @@
//
// Remember to start writing at line 2. This is my second attempt at Firefox
// autoconfig after being taught by LibreAwoo, but this time I am trying to
// avoid duplicating my browser policy, which you can find from the same
// repository, etc/firefox/policies/policies.json
// If autoconfig is not found, fallback. Also means this file.
lockPref("autoadmin.failover_to_cached", true);
lockPref(
pref("autoadmin.failover_to_cached", true);
pref(
"autoadmin.global_config_url",
"https://gitea.blesmrt.net/mikaela/shell-things/raw/branch/master/conf/firefox-forbidden-policies.js",
);
lockPref("autoadmin.offline_failover", true);
lockPref("autoadmin.refresh_interval", 120);
pref("autoadmin.offline_failover", true);
pref("autoadmin.refresh_interval", 120);
// Automatically click cookiebanners although uBlock Origin might block them
lockPref("cookiebanners.bannerClicking.enabled", true);
lockPref("cookiebanners.service.mode", 2);
lockPref("cookiebanners.service.mode.privateBrowsing", 2);
// I can set my preferred fonts in an order! :O
// but obviously this is forbidden in policies.json!
lockPref(
"font.name-list.monospace.x-cyrillic",
"Noto Shanns Mono, monospace",
);
lockPref("font.name-list.monospace.x-western", "Noto Shanns Mono, monospace");
lockPref("font.name-list.sans-serif.x-cyrillic", "Noto Sans, sans-serif");
lockPref("font.name-list.sans-serif.x-western", "Noto Sans, sans-serif");
lockPref("font.name-list.serif.x-cyrillic", "Noto Serif, serif");
lockPref("font.name-list.serif.x-western", "Noto Serif, serif");
pref("cookiebanners.bannerClicking.enabled", true);
pref("cookiebanners.service.mode", 2);
pref("cookiebanners.service.mode.privateBrowsing", 2);
// Play animated images only once, accessibility.
lockPref("image.animation.mode", "once");
pref("image.animation.mode", "once");
// Spoof en-US as language to scripts
lockPref("javascript.use_us_english_locale", true);
pref("javascript.use_us_english_locale", true);
// DNT although PrivacyBadger from policy handles this
lockPref("privacy.donottrackheader.enabled", true);
lockPref("privacy.donottrackheader.value", 1);
pref("privacy.donottrackheader.enabled", true);
pref("privacy.donottrackheader.value", 1);
// More tunable privacy.resistfingerprinting. I have lost the privacy game
// many times before this point, so this is nothing.
//lockPref("privacy.fingerprintingProtection", true);
// Somehow I cannot clearPref this, so...
//clearPref("privacy.fingerprintingProtection");
lockPref("privacy.fingerprintingProtection", false);
//pref(
// "privacy.fingerprintingProtection.overrides",
// "+AllTargets,-KeyboardEvents,-SpeechSynthesis,-CSSPrefersColorScheme,-CSSPrefersReducedMotion,-NavigatorPlatform,-NavigatorUserAgent,-JSDateTimeUTC,-HttpUserAgent,-FontVisibilityRestrictGenerics,-FontVisibilityBaseSystem,-FontVisibilityLangPack",
//);
clearPref("privacy.fingerprintingProtection.overrides");
//lockPref("privacy.fingerprintingProtection.pbmode", true);
clearPref("privacy.fingerprintingProtection.pbmode");
pref("privacy.fingerprintingProtection", true);
pref(
"privacy.fingerprintingProtection.overrides",
"+AllTargets,-KeyboardEvents,-SpeechSynthesis,-CSSPrefersColorScheme,-CSSPrefersReducedMotion,-NavigatorPlatform,-NavigatorUserAgent,-JSDateTimeUTC,-HttpUserAgent,-FontVisibilityRestrictGenerics,-FontVisibilityBaseSystem,-FontVisibilityLangPack",
);
pref("privacy.fingerprintingProtection.pbmode", true);
// (Incompatible with the above)
//lockPref("privacy.resistFingerprinting", false);
clearPref("privacy.resistFingerprinting");
//lockPref("privacy.resistFingerprinting.block_mozAddonManage", true);
clearPref("privacy.resistFingerprinting.block_mozAddonManage");
pref("privacy.resistFingerprinting", false);
pref("privacy.resistFingerprinting.block_mozAddonManage", true);
// Letterboxing from Tor Browser, I like it in general.
lockPref("privacy.resistFingerprinting.letterboxing", true);
pref("privacy.resistFingerprinting.letterboxing", true);
// Still Incompatible with the above
//lockPref("privacy.resistFingerprinting.pbmode", false);
clearPref("privacy.resistFingerprinting.pbmode");
pref("privacy.resistFingerprinting.pbmode", false);
// Which extension requires container tabs? My policy and this file. This
// particular option is so forbidden, it cannot be set either in the policy
// or autoconfig.js
lockPref("privacy.userContext.extension", "");
// Enable containers without extensions (although those are forced by the
// policy. TODO: Remove these as they are in the policy, but disallowed by
// current ESR
lockPref("privacy.userContext.enabled", true);
lockPref("privacy.userContext.ui.enabled", true);
pref("privacy.userContext.enabled", true);
pref("privacy.userContext.ui.enabled", true);
// Enables reading mode for all pages (at least in theory)
lockPref("reader.parse-on-load.force-enabled", true);
pref("reader.parse-on-load.force-enabled", true);
// Ensure OCSP stapling is enabled, especially if the server has it
lockPref("security.ssl.enable_ocsp_must_staple", true);
pref("security.ssl.enable_ocsp_must_staple", true);
// TODO: Consider removing this when ESR updates as only it needs this for
// ECH, which is otherwise the default=
lockPref("security.tls.ech.grease_http3", true);
pref("security.tls.ech.grease_http3", true);
// No making configuration on the last line of the file!
//

View File

@ -21,10 +21,7 @@
"memory": {
"format": "RAM {percentage}%"
},
"modules-left": [
"sway/workspaces",
"sway/mode"
],
"modules-left": ["sway/workspaces", "sway/mode"],
"modules-right": [
"gamemode",
"cpu",
@ -52,10 +49,7 @@
"pulseaudio": {
"format": "VOL {volume}%",
"format-bluetooth": "BT VOL {volume}%",
"ignored-sinks": [
"Easy Effects Sink",
"Easy Effects Source"
]
"ignored-sinks": ["Easy Effects Sink", "Easy Effects Source"]
},
"sway/language": {
"format": "KBD {short} {variant}",

View File

@ -4,9 +4,7 @@
"Extensions": {
"adnauseam@rednoise.org": {
"toAdd": {
"trustedSiteDirectives": [
""
]
"trustedSiteDirectives": [""]
},
"toOverwrite": {
"filterLists": [
@ -18,11 +16,7 @@
},
"jid1-MnnxcxisBPnSXQ@jetpack": {
"checkForDNTPolicy": true,
"disabledSites": [
"cloudflare.com",
"ecosia.org",
"keyoxide.org"
],
"disabledSites": ["cloudflare.com", "ecosia.org", "keyoxide.org"],
"learnInIncognito": true,
"learnLocally": true,
"sendDNTSignal": true,
@ -36,7 +30,6 @@
"uBlock0@raymondhill.net": {
"toAdd": {
"trustedSiteDirectives": [
"azure.com",
"bittimittari.fi",
"chrome-extension-scheme",
"cloudflare.com",
@ -50,10 +43,7 @@
"live.com",
"matrix.org",
"microsoft.com",
"microsoft365.com",
"microsoftonline.com",
"moz-extension-scheme",
"office.com",
"one.one",
"pikaviestin.fi"
]
@ -111,10 +101,7 @@
},
"DNSOverHTTPS": {
"Enabled": false,
"ExcludedDomains": [
"http.badssl.com",
"norwegianwifi.com"
],
"ExcludedDomains": ["http.badssl.com", "norwegianwifi.com"],
"Fallback": true,
"Locked": true,
"ProviderURL": "https://dns0.eu/",
@ -128,10 +115,24 @@
"DisplayBookmarksToolbar": "never",
"DontCheckDefaultBrowser": true,
"EnableTrackingProtection": {
"Comment": "Managing tracking protection is left for the user unless there is a heavy reason to do otherwise.",
"Cryptomining": true,
"EmailTracking": true,
"Exceptions": [
"https://ac.ecosia.org",
"https://app.element.io",
"https://bittimittari.fi",
"https://challenges.cloudflare.com",
"https://chat.pikaviestin.fi",
"https://develop.element.io",
"https://glowing-bear.org",
"https://keyoxide.org",
"https://latest.glowing-bear.org",
"https://learn.microsoft.com",
"https://one.one.one.one",
"https://pp-attester-turnstile.research.cloudflare.com",
"https://staging.element.io",
"https://teams.microsoft.com",
"https://webchat.disroot.org",
"https://www.ecosia.org"
],
"Fingerprinting": true,
@ -143,10 +144,6 @@
"Locked": false
},
"ExtensionSettings": {
"@contain-facebook": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/facebook-container/latest.xpi",
"installation_mode": "normal_installed"
},
"adnauseam@rednoise.org": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/adnauseam/latest.xpi",
"installation_mode": "blocked"
@ -165,13 +162,14 @@
},
"peertube-companion@booteille": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/peertube-companion/latest.xpi",
"installation_mode": "default_installed"
"installation_mode": "force_installed"
},
"plasma-browser-integration@kde.org": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/plasma-integration/latest.xpi",
"installation_mode": "force_installed"
},
"uBlock0@raymondhill.net": {
"blocked_install_message": "uBlock Origin on integroitu AdNauseamiin, joka on forkki siitä.",
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi",
"installation_mode": "force_installed"
},
@ -204,6 +202,10 @@
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/http-indicator/latest.xpi",
"installation_mode": "normal_installed"
},
"{759dbb01-b646-4327-bf9e-69ca2543ef8d}": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/opendyslexic-for-firefox/latest.xpi",
"installation_mode": "normal_installed"
},
"{a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7}": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/user-agent-string-switcher/latest.xpi",
"installation_mode": "normal_installed"
@ -271,7 +273,7 @@
"Value": 120
},
"browser.aboutConfig.showWarning": {
"Status": "default",
"Status": "locked",
"Type": "boolean",
"Value": false
},
@ -300,69 +302,6 @@
"Type": "boolean",
"Value": false
},
"browser.crashReports.unsubmittedCheck.autoSubmit2": {
"Comment": "Automatically sending crash reports, but letting the user say no.",
"Status": "default",
"Type": "boolean",
"Value": true
},
"browser.discovery.enabled": {
"Comment": "This means personalized extension recommendations in extension management.",
"Status": "locked",
"Type": "boolean",
"Value": false
},
"browser.safebrowsing.blockedURIs.enabled": {
"Status": "locked",
"Type": "boolean",
"Value": true
},
"browser.safebrowsing.downloads.remote.url": {
"Status": "clear"
},
"browser.safebrowsing.malware.enabled": {
"Status": "locked",
"Type": "boolean",
"Value": true
},
"browser.safebrowsing.phishing.enabled": {
"Status": "locked",
"Type": "boolean",
"Value": true
},
"browser.safebrowsing.provider.google.gethashURL": {
"Status": "clear"
},
"browser.safebrowsing.provider.google.lists": {
"Status": "clear"
},
"browser.safebrowsing.provider.google.updateURL": {
"Status": "clear"
},
"browser.safebrowsing.provider.google4.dataSharingURL": {
"Status": "clear"
},
"browser.safebrowsing.provider.google4.gethashURL": {
"Status": "clear"
},
"browser.safebrowsing.provider.google4.updateURL": {
"Status": "clear"
},
"browser.safebrowsing.provider.mozilla.gethashURL": {
"Status": "clear"
},
"browser.safebrowsing.provider.mozilla.lists": {
"Status": "clear"
},
"browser.safebrowsing.provider.mozilla.lists.base": {
"Status": "clear"
},
"browser.safebrowsing.provider.mozilla.lists.content": {
"Status": "clear"
},
"browser.safebrowsing.provider.mozilla.updateURL": {
"Status": "clear"
},
"browser.translation.neverForLanguages": {
"Status": "default",
"Type": "string",
@ -401,56 +340,12 @@
"Type": "boolean",
"Value": true
},
"extensions.htmlaboutaddons.recommendations.enabled": {
"Comment": "This means the same, but without personalization.",
"Status": "locked",
"Type": "boolean",
"Value": false
},
"extensions.webextensions.restrictedDomains": {
"Comment": "Don't protect Mozilla domains from privacy extensions.",
"Status": "locked",
"Type": "string",
"Value": ""
},
"font.name-list.monospace.x-cyrillic": {
"Comment": "Preference not allowed for stability reasons.",
"Status": "default",
"Type": "string",
"Value": "Noto Shanns Mono, monospace"
},
"font.name-list.monospace.x-western": {
"Comment": "Preference not allowed for stability reasons.",
"Status": "default",
"Type": "string",
"Value": "Noto Shanns Mono, monospace"
},
"font.name-list.sans-serif.x-cyrillic": {
"Comment": "Preference not allowed for stability reasons.",
"Status": "default",
"Type": "string",
"Value": "Noto Sans, sans-serif"
},
"font.name-list.sans-serif.x-western": {
"Comment": "Preference not allowed for stability reasons.",
"Status": "default",
"Type": "string",
"Value": "Noto Sans, sans-serif"
},
"font.name-list.serif.x-cyrillic": {
"Comment": "Preference not allowed for stability reasons.",
"Status": "default",
"Type": "string",
"Value": "Noto Serif, serif"
},
"font.name-list.serif.x-western": {
"Comment": "Preference not allowed for stability reasons.",
"Status": "default",
"Type": "string",
"Value": "Noto Serif, serif"
},
"general.config.obscure_value": {
"Comment": "Required for autoconfig.",
"Status": "locked",
"Type": "number",
"Value": 0
@ -468,7 +363,7 @@
"intl.accept_languages": {
"Status": "locked",
"Type": "string",
"Value": "fi, fi-FI, en, en-FI, en-EU, en-IE, en-GB, en-US, ru, ru-RU"
"Value": "fi, en, ru"
},
"javascript.use_us_english_locale": {
"Comment": "Preference not allowed for stability reasons. :(",
@ -482,19 +377,16 @@
"Value": "1.5"
},
"layout.css.prefers-color-scheme.content-override": {
"Comment": "Dark theme by default, disabling allowed",
"Status": "default",
"Type": "number",
"Value": 0
},
"media.autoplay.default": {
"Comment": "Not even autoplaying silently?",
"Status": "default",
"Type": "number",
"Value": 5
},
"network.IDN_show_punycode": {
"Comment": "Protection against identically looking unicode domain names",
"Status": "locked",
"Type": "boolean",
"Value": true
@ -534,10 +426,14 @@
"Value": true
},
"network.http.referer.XOriginTrimmingPolicy": {
"Status": "clear"
"Status": "default",
"Type": "number",
"Value": 2
},
"network.http.referer.defaultPolicy": {
"Status": "clear"
"Status": "default",
"Type": "number",
"Value": 1
},
"network.http.speculative-parallel-limit": {
"Status": "clear"
@ -573,7 +469,6 @@
"Value": false
},
"pdfjs.enableScripting": {
"Comment": "I don't see a good reason for allowing scripts in pdf files in a web browser.",
"Status": "locked",
"Type": "boolean",
"Value": false
@ -607,19 +502,19 @@
},
"privacy.fingerprintingProtection": {
"Comment": "Preference not allowed for stability reasons. :(",
"Status": "clear",
"Status": "locked",
"Type": "boolean",
"Value": true
},
"privacy.fingerprintingProtection.overrides": {
"Comment": "Preference not allowed for stability reasons. :(",
"Status": "clear",
"Status": "locked",
"Type": "string",
"Value": "+AllTargets,-KeyboardEvents,-SpeechSynthesis,-CSSPrefersColorScheme,-CSSPrefersReducedMotion,-NavigatorPlatform,-NavigatorUserAgent,-JSDateTimeUTC,-HttpUserAgent,-FontVisibilityRestrictGenerics,-FontVisibilityBaseSystem,-FontVisibilityLangPack"
},
"privacy.fingerprintingProtection.pbmode": {
"Comment": "Preference not allowed for stability reasons. :(",
"Status": "clear",
"Status": "locked",
"Type": "boolean",
"Value": true
},
@ -630,13 +525,13 @@
},
"privacy.resistFingerprinting": {
"Comment": "Preference not allowed for stability reasons. :(",
"Status": "clear",
"Status": "locked",
"Type": "boolean",
"Value": false
},
"privacy.resistFingerprinting.block_mozAddonManage": {
"Comment": "Preference not allowed for stability reasons. :(",
"Status": "clear",
"Status": "locked",
"Type": "boolean",
"Value": true
},
@ -648,24 +543,16 @@
},
"privacy.resistFingerprinting.pbmode": {
"Comment": "Preference not allowed for stability reasons. :(",
"Status": "clear",
"Status": "locked",
"Type": "boolean",
"Value": false
},
"privacy.userContext.enabled": {
"Comment": "Tab containers",
"Status": "locked",
"Type": "boolean",
"Value": true
},
"privacy.userContext.extension": {
"Comment": "Displays in settings which extension requires container tabs. None. it's this policy. Preference not allowed for stability reasons.",
"Status": "locked",
"Type": "string",
"Value": ""
},
"privacy.userContext.ui.enabled": {
"Comment": "Tab containers UI without extensions",
"Status": "locked",
"Type": "boolean",
"Value": true
@ -709,7 +596,6 @@
"Value": true
},
"ui.systemUsesDarkTheme": {
"Comment": "Another defaulting to dark theme.",
"Status": "default",
"Type": "number",
"Value": 1

View File

@ -10,7 +10,6 @@
"cjpalhdlnbpafiamejdnhcphjbkeiagm": {
"toAdd": {
"trustedSiteDirectives": [
"azure.com",
"bittimittari.fi",
"chrome-extension-scheme",
"cloudflare.com",
@ -24,10 +23,7 @@
"live.com",
"matrix.org",
"microsoft.com",
"microsoft365.com",
"microsoftonline.com",
"moz-extension-scheme",
"office.com",
"one.one",
"pikaviestin.fi"
]
@ -67,9 +63,7 @@
},
"mlojlfildnehdpnlmpkeiiglhhkofhpb": {
"toAdd": {
"trustedSiteDirectives": [
""
]
"trustedSiteDirectives": [""]
},
"toOverwrite": {
"filterLists": [
@ -81,11 +75,7 @@
},
"pkehgijcmpdhfbdbbnkijodmdjhbjlgp": {
"checkForDNTPolicy": true,
"disabledSites": [
"cloudflare.com",
"ecosia.org",
"keyoxide.org"
],
"disabledSites": ["cloudflare.com", "ecosia.org", "keyoxide.org"],
"learnInIncognito": true,
"learnLocally": true,
"sendDNTSignal": true,

View File

@ -1,6 +1,20 @@
{
"BraveShieldsDisabledForUrls": [
"https://ac.ecosia.org",
"https://app.element.io",
"https://bittimittari.fi",
"https://challenges.cloudflare.com",
"https://chat.pikaviestin.fi",
"https://develop.element.io",
"https://glowing-bear.org",
"https://keyoxide.org",
"https://latest.glowing-bear.org",
"https://learn.microsoft.com",
"https://one.one.one.one",
"https://pp-attester-turnstile.research.cloudflare.com",
"https://staging.element.io",
"https://teams.microsoft.com",
"https://webchat.disroot.org",
"https://www.ecosia.org"
],
"BraveShieldsDisabledForUrls_comment": "Managing tracking protection is left for the user unless there is a heavy reason to do otherwise."
]
}

View File

@ -1,14 +1,3 @@
{
"ForcedLanguages": [
"fi",
"fi-FI",
"en",
"en-FI",
"en-EU",
"en-IE",
"en-GB",
"en-US",
"ru",
"ru-RU"
]
"ForcedLanguages": ["fi", "en", "ru"]
}

View File

@ -1,3 +0,0 @@
{
"RestoreOnStartup": 1
}