Compare commits

..

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

11 changed files with 124 additions and 194 deletions

View File

@ -20,17 +20,14 @@ cat etc/ssh/ssh_config >~/.ssh/config
cat .editorconfig >~/.editorconfig
mkdir -p ~/.local/firefox/defaults/pref/
cat conf/autoconfig.js >~/.local/firefox/defaults/pref/autoconfig.js
#cat conf/librewolf.overrides.cfg >~/.local/firefox/librewolf.overrides.cfg
cat conf/firefox-forbidden-policies.js >~/.local/firefox/firefox-forbidden-policies.js
#cat conf/librewolf.overrides.cfg >~/public_html/autoconfig.js
cat conf/firefox-forbidden-policies.js >~/public_html/autoconfig.js
cat conf/librewolf.overrides.cfg >~/.local/firefox/librewolf.overrides.cfg
cat conf/librewolf.overrides.cfg >~/public_html/autoconfig.js
mkdir -p ~/.librewolf/ ~/.var/app/io.gitlab.librewolf-community/.librewolf/
#cat conf/librewolf.overrides.cfg >~/.librewolf/librewolf.overrides.cfg
cat conf/firefox-forbidden-policies.js >~/.librewolf/librewolf.overrides.cfg
#cat conf/librewolf.overrides.cfg >~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg
cat conf/firefox-forbidden-policies.js >~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg
cat conf/librewolf.overrides.cfg >~/.librewolf/librewolf.overrides.cfg
cat conf/librewolf.overrides.cfg >~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg
mkdir -p ~/.local/share/applications
ln -nsfv ~/.shell-things/local/share/applications ~/.local/share/applications/shell-things
ln -sfv ~/.shell-things/local/share/applications ~/.local/share/applications/shell-things
rm -fv ~/.shell-things/local/share/applications/applications
if hash update-desktop-database 2>/dev/null; then
update-desktop-database ~/.local/share/applications
fi

View File

@ -49,15 +49,14 @@ repos:
- id: fix-byte-order-marker
- id: mixed-line-ending
args: [--fix=auto]
# Remember to check that prettier excludes it, if used!
#- id: pretty-format-json
- 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]
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
@ -134,8 +133,8 @@ repos:
rev: "v3.2.5"
hooks:
- id: prettier
# These are handled by Black below
exclude_types: [python, pyi, jupyter]
# These are handled by Black below or pretty-format-json above
exclude_types: [python, pyi, jupyter, json]
additional_dependencies: [
# https://www.npmjs.com/package/prettier
"prettier@3.2.5",

View File

@ -3,7 +3,6 @@
// However the file below belongs to ../../ e.g. /usr/lib/64/firefox/ or
// ~/.local/firefox/
//pref("general.config.filename", "librewolf.overrides.cfg");
pref("general.config.filename", "firefox-forbidden-policies.js");
pref("general.config.filename", "librewolf.overrides.cfg");
pref("general.config.obscure_value", 0);
// vim: filetype=javascript

View File

@ -1,6 +1,6 @@
// This file belongs to Firefox `default/pref` directory as `autoconfig.js`.
// E.g. /usr/lib64/firefox/defaults/pref/autoconfig.js
//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","https://gitea.blesmrt.net/mikaela/shell-things/raw/branch/master/conf/librewolf.overrides.cfg");
pref("autoadmin.global_config_url","file:///home/aminda/public_html/autoconfig.js");
pref("general.config.obscure_value", 0);
pref("autoadmin.refresh_interval", 120);

View File

@ -1,63 +0,0 @@
// 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.
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",
);
pref("autoadmin.offline_failover", true);
pref("autoadmin.refresh_interval", 120);
// Automatically click cookiebanners although uBlock Origin might block them
pref("cookiebanners.bannerClicking.enabled", true);
pref("cookiebanners.service.mode", 2);
pref("cookiebanners.service.mode.privateBrowsing", 2);
// Play animated images only once, accessibility.
pref("image.animation.mode", "once");
// Spoof en-US as language to scripts
pref("javascript.use_us_english_locale", true);
// DNT although PrivacyBadger from policy handles this
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.
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)
pref("privacy.resistFingerprinting", false);
pref("privacy.resistFingerprinting.block_mozAddonManage", true);
// Letterboxing from Tor Browser, I like it in general.
pref("privacy.resistFingerprinting.letterboxing", true);
// Still Incompatible with the above
pref("privacy.resistFingerprinting.pbmode", false);
// 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
pref("privacy.userContext.enabled", true);
pref("privacy.userContext.ui.enabled", true);
// Enables reading mode for all pages (at least in theory)
pref("reader.parse-on-load.force-enabled", true);
// Ensure OCSP stapling is enabled, especially if the server has it
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=
pref("security.tls.ech.grease_http3", true);
// No making configuration on the last line of the file!
//

View File

@ -21,7 +21,10 @@
"memory": {
"format": "RAM {percentage}%"
},
"modules-left": ["sway/workspaces", "sway/mode"],
"modules-left": [
"sway/workspaces",
"sway/mode"
],
"modules-right": [
"gamemode",
"cpu",
@ -49,7 +52,10 @@
"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,7 +4,9 @@
"Extensions": {
"adnauseam@rednoise.org": {
"toAdd": {
"trustedSiteDirectives": [""]
"trustedSiteDirectives": [
""
]
},
"toOverwrite": {
"filterLists": [
@ -16,7 +18,21 @@
},
"jid1-MnnxcxisBPnSXQ@jetpack": {
"checkForDNTPolicy": true,
"disabledSites": ["cloudflare.com", "ecosia.org", "keyoxide.org"],
"disabledSites": [
"app.element.io",
"staging.element.io",
"develop.element.io",
"chat.pikaviestin.fi",
"webchat.disroot.org",
"learn.microsoft.com",
"teams.microsoft.com",
"bittimittari.fi",
"pp-attester-turnstile.research.cloudflare.com",
"keyoxide.org",
"one.one.one.one",
"www.ecosia.org",
"ac.ecosia.org"
],
"learnInIncognito": true,
"learnLocally": true,
"sendDNTSignal": true,
@ -30,22 +46,19 @@
"uBlock0@raymondhill.net": {
"toAdd": {
"trustedSiteDirectives": [
"app.element.io",
"staging.element.io",
"develop.element.io",
"chat.pikaviestin.fi",
"webchat.disroot.org",
"learn.microsoft.com",
"teams.microsoft.com",
"bittimittari.fi",
"chrome-extension-scheme",
"cloudflare.com",
"disroot.org",
"duckduckgo.com",
"ecosia.org",
"element.io",
"google",
"google.com",
"pp-attester-turnstile.research.cloudflare.com",
"keyoxide.org",
"live.com",
"matrix.org",
"microsoft.com",
"moz-extension-scheme",
"one.one",
"pikaviestin.fi"
"one.one.one.one",
"www.ecosia.org",
"ac.ecosia.org"
]
},
"toOverwrite": {
@ -65,19 +78,9 @@
"ublock-quick-fixes",
"FIN-0",
"RUS-0",
"BGR-0",
"CZE-0",
"EST-0",
"SPA-0",
"NOR-0",
"SWE-1",
"https://big.oisd.nl",
"adguard-mobile-app-banners",
"fanboy-cookiemonster",
"ublock-cookies-easylist",
"adguard-cookies",
"ublock-cookies-adguard",
"https://raw.githubusercontent.com/liamengland1/miscfilters/master/antipaywall.txt"
"ublock-annoyances",
"adguard-mobile-app-banners"
]
}
}
@ -101,7 +104,10 @@
},
"DNSOverHTTPS": {
"Enabled": false,
"ExcludedDomains": ["http.badssl.com", "norwegianwifi.com"],
"ExcludedDomains": [
"http.badssl.com",
"norwegianwifi.com"
],
"Fallback": true,
"Locked": true,
"ProviderURL": "https://dns0.eu/",
@ -118,22 +124,21 @@
"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://develop.element.io",
"https://chat.pikaviestin.fi",
"https://webchat.disroot.org",
"https://www.ecosia.org"
"https://learn.microsoft.com",
"https://teams.microsoft.com",
"https://glowing-bear.org",
"https://latest.glowing-bear.org",
"https://bittimittari.fi",
"https://pp-attester-turnstile.research.cloudflare.com",
"https://keyoxide.org",
"https://one.one.one.one",
"https://www.ecosia.org",
"https://ac.ecosia.org"
],
"Fingerprinting": true,
"Locked": false,
@ -144,6 +149,10 @@
"Locked": false
},
"ExtensionSettings": {
"addon@darkreader.org": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi",
"installation_mode": "normal_installed"
},
"adnauseam@rednoise.org": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/adnauseam/latest.xpi",
"installation_mode": "blocked"
@ -213,10 +222,6 @@
"{b5501fd1-7084-45c5-9aa6-567c2fcf5dc6}": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/ruffle_rs/latest.xpi",
"installation_mode": "normal_installed"
},
"{d04b0b40-3dab-4f0b-97a6-04ec3eddbfb0}": {
"install_url": "https://addons.mozilla.org/firefox/downloads/latest/ecosia-the-green-search/latest.xpi",
"installation_mode": "normal_installed"
}
},
"FirefoxHome": {
@ -258,7 +263,7 @@
"Comment": "Preference not allowed for stability reasons. :(",
"Status": "locked",
"Type": "string",
"Value": "https://gitea.blesmrt.net/mikaela/shell-things/raw/branch/master/conf/firefox-forbidden-policies.js"
"Value": "https://gitea.blesmrt.net/mikaela/shell-things/raw/branch/master/conf/librewolf.overrides.cfg"
},
"autoadmin.offline_failover": {
"Comment": "Preference not allowed for stability reasons. :(",
@ -302,16 +307,6 @@
"Type": "boolean",
"Value": false
},
"browser.translation.neverForLanguages": {
"Status": "default",
"Type": "string",
"Value": "en, fi"
},
"browser.translations.neverTranslateLanguages": {
"Status": "default",
"Type": "string",
"Value": "en, fi"
},
"cookiebanners.bannerClicking.enabled": {
"Comment": "Preference not allowed for stability reasons. :(",
"Status": "locked",

View File

@ -10,22 +10,19 @@
"cjpalhdlnbpafiamejdnhcphjbkeiagm": {
"toAdd": {
"trustedSiteDirectives": [
"app.element.io",
"staging.element.io",
"develop.element.io",
"chat.pikaviestin.fi",
"webchat.disroot.org",
"learn.microsoft.com",
"teams.microsoft.com",
"bittimittari.fi",
"chrome-extension-scheme",
"cloudflare.com",
"disroot.org",
"duckduckgo.com",
"ecosia.org",
"element.io",
"google",
"google.com",
"pp-attester-turnstile.research.cloudflare.com",
"keyoxide.org",
"live.com",
"matrix.org",
"microsoft.com",
"moz-extension-scheme",
"one.one",
"pikaviestin.fi"
"one.one.one.one",
"www.ecosia.org",
"ac.ecosia.org"
]
},
"toOverwrite": {
@ -45,25 +42,17 @@
"ublock-quick-fixes",
"FIN-0",
"RUS-0",
"BGR-0",
"CZE-0",
"EST-0",
"SPA-0",
"NOR-0",
"SWE-1",
"https://big.oisd.nl",
"adguard-mobile-app-banners",
"fanboy-cookiemonster",
"ublock-cookies-easylist",
"adguard-cookies",
"ublock-cookies-adguard",
"https://raw.githubusercontent.com/liamengland1/miscfilters/master/antipaywall.txt"
"ublock-annoyances",
"adguard-mobile-app-banners"
]
}
},
"mlojlfildnehdpnlmpkeiiglhhkofhpb": {
"toAdd": {
"trustedSiteDirectives": [""]
"trustedSiteDirectives": [
""
]
},
"toOverwrite": {
"filterLists": [
@ -75,7 +64,21 @@
},
"pkehgijcmpdhfbdbbnkijodmdjhbjlgp": {
"checkForDNTPolicy": true,
"disabledSites": ["cloudflare.com", "ecosia.org", "keyoxide.org"],
"disabledSites": [
"app.element.io",
"staging.element.io",
"develop.element.io",
"chat.pikaviestin.fi",
"webchat.disroot.org",
"learn.microsoft.com",
"teams.microsoft.com",
"bittimittari.fi",
"pp-attester-turnstile.research.cloudflare.com",
"keyoxide.org",
"one.one.one.one",
"www.ecosia.org",
"ac.ecosia.org"
],
"learnInIncognito": true,
"learnLocally": true,
"sendDNTSignal": true,

View File

@ -1,20 +1,19 @@
{
"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://develop.element.io",
"https://chat.pikaviestin.fi",
"https://webchat.disroot.org",
"https://www.ecosia.org"
"https://learn.microsoft.com",
"https://teams.microsoft.com",
"https://glowing-bear.org",
"https://latest.glowing-bear.org",
"https://bittimittari.fi",
"https://pp-attester-turnstile.research.cloudflare.com",
"https://keyoxide.org",
"https://one.one.one.one",
"https://www.ecosia.org",
"https://ac.ecosia.org"
]
}

View File

@ -1,3 +1,7 @@
{
"ForcedLanguages": ["fi", "en", "ru"]
"ForcedLanguages": [
"fi",
"en",
"ru"
]
}

11
install
View File

@ -2,16 +2,7 @@
# Do not use this script unless you know what you are doing!
set -x
if [ -d ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers ]; then
printf "\n[OK] ssh-allowed_signers exists\n\n"
else
echo "Keys not found, cloning..."
mkdir -vp ~/src/gitea.blesmrt.net/Mikaela/
git clone https://gitea.blesmrt.net/Mikaela/ssh-allowed_signers.git ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers
fi
git verify-commit HEAD
sleep 3
export MIKAELA_GREP=$HOME/.MIKAELA_GREP
@ -23,7 +14,7 @@ mkdir -p ~/.config/git
cat conf/gitconfig >~/.config/git/config
touch ~/.gitconfig
rm ~/.gitconfig
ln -nsfv ~/.config/git/config ~/.gitconfig
ln -sfv ~/.config/git/config ~/.gitconfig
mkdir -p ~/.git-template
cat rc/vimrc >~/.vimrc
mkdir -p ~/.config/nvim/