Compare commits

..

No commits in common. "ae471c224bbed865f3c1330e3769a1162e4aa8c6" and "9a78f6c3878088877fb3a202a3d541ead3ac48c8" have entirely different histories.

14 changed files with 56 additions and 123 deletions

3
.gitattributes vendored
View File

@ -75,6 +75,3 @@ LICENSE text lockable
CITATION.cff text lockable
# NOTE! .gitattributes doesn't support the case-insensitive style above!
package.json text linguist-vendored
pnpm-lock.yaml text linguist-vendored

5
.gitignore vendored
View File

@ -12,8 +12,6 @@
!.mikaela
!.mikaela_install
!.pre-commit-config.yaml
!.prettierignore
!.prettierrc
!.reuse
# Certificates (unlikely to happen, but better safe than sorry)
@ -22,6 +20,3 @@
# Symlinks
install.run
LICENSE
node_modules/

View File

@ -18,11 +18,10 @@ mkdir -p ~/.ssh
cat .mikaela/keys/authorized_keys >~/.ssh/authorized_keys
cat etc/ssh/ssh_config >~/.ssh/config
cat .editorconfig >~/.editorconfig
if [ -d ~/.local/firefox/defaults/pref/ ]; then
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
fi
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
mkdir -p ~/.librewolf/ ~/.var/app/io.gitlab.librewolf-community/.librewolf/

View File

View File

View File

@ -19,12 +19,9 @@
"jid1-MnnxcxisBPnSXQ@jetpack": {
"checkForDNTPolicy": true,
"disabledSites": [
"challenges.cloudflare.com",
"chrome-extension-scheme",
"cloudflare.com",
"ecosia.org",
"keyoxide.org",
"moz-extension-scheme",
"research.cloudflare.com"
"keyoxide.org"
],
"learnInIncognito": true,
"learnLocally": true,
@ -39,13 +36,26 @@
"uBlock0@raymondhill.net": {
"toAdd": {
"trustedSiteDirectives": [
"azure.com",
"bittimittari.fi",
"chrome-extension-scheme",
"challenges.cloudflare.com",
"cloudflare.com",
"disroot.org",
"duckduckgo.com",
"ecosia.org",
"element.io",
"google",
"google.com",
"keyoxide.org",
"live.com",
"matrix.org",
"microsoft.com",
"microsoft365.com",
"microsoftonline.com",
"moz-extension-scheme",
"research.cloudflare.com"
"office.com",
"one.one",
"pikaviestin.fi"
]
},
"toOverwrite": {
@ -68,8 +78,7 @@
"ublock-cookies-easylist",
"adguard-cookies",
"ublock-cookies-adguard",
"ublock-quick-fixes",
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener.txt"
"ublock-quick-fixes"
]
}
}
@ -228,10 +237,6 @@
"Enabled": true
},
"Preferences": {
"app.update.download.attempts": {
"Comment": "If this is what it looks like, it will stop the prompts to download Firefox manually.",
"Status": "clear"
},
"autoadmin.failover_to_cached": {
"Comment": "Preference not allowed for stability reasons. :(",
"Status": "locked",
@ -701,7 +706,6 @@
"Value": 1
}
},
"PromptForDownloadLocation": true,
"SearchEngines": {
"Add": [
{
@ -759,7 +763,6 @@
"Fujitsu mPollux DigiSignApplication": "/usr/lib64/libcryptoki.so"
}
},
"ShowHomeButton": true,
"StartDownloadsInTempDirectory": true
"ShowHomeButton": true
}
}

View File

@ -29,6 +29,7 @@
- [`disable-brave-tor.json`](#disable-brave-torjson)
- [`disable-brave-vpn.json`](#disable-brave-vpnjson)
- [`disable-floc.json`](#disable-flocjson)
- [`disable-incognito.json.badidea`](#disable-incognitojsonbadidea)
- [`doh-adguard-dns0.json`](#doh-adguard-dns0json)
- [`dph-adguard.json`](#dph-adguardjson)
- [`doh-adguard-unfiltered.json`](#doh-adguard-unfilteredjson)
@ -208,6 +209,10 @@ Disables floc or ad topics that are against privacy.
- https://start.duckduckgo.com/?q=google+floc+privacy+topics
## `disable-incognito.json.badidea`
Disables incognito mode. I don't recommend this.
## `doh-adguard-dns0.json`
## `dph-adguard.json`

View File

@ -10,13 +10,26 @@
"cjpalhdlnbpafiamejdnhcphjbkeiagm": {
"toAdd": {
"trustedSiteDirectives": [
"azure.com",
"bittimittari.fi",
"chrome-extension-scheme",
"challenges.cloudflare.com",
"cloudflare.com",
"disroot.org",
"duckduckgo.com",
"ecosia.org",
"element.io",
"google",
"google.com",
"keyoxide.org",
"live.com",
"matrix.org",
"microsoft.com",
"microsoft365.com",
"microsoftonline.com",
"moz-extension-scheme",
"research.cloudflare.com"
"office.com",
"one.one",
"pikaviestin.fi"
]
},
"toOverwrite": {
@ -39,8 +52,7 @@
"ublock-cookies-easylist",
"adguard-cookies",
"ublock-cookies-adguard",
"ublock-quick-fixes",
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener.txt"
"ublock-quick-fixes"
]
}
},
@ -61,12 +73,9 @@
"pkehgijcmpdhfbdbbnkijodmdjhbjlgp": {
"checkForDNTPolicy": true,
"disabledSites": [
"challenges.cloudflare.com",
"chrome-extension-scheme",
"cloudflare.com",
"ecosia.org",
"keyoxide.org",
"moz-extension-scheme",
"research.cloudflare.com"
"keyoxide.org"
],
"learnInIncognito": true,
"learnLocally": true,

View File

@ -1,4 +0,0 @@
{
"DownloadRestrictions": 4,
"PromptForDownloadLocation": true
}

View File

@ -0,0 +1,3 @@
{
"IncognitoModeAvailability": "Disabled"
}

View File

@ -4,10 +4,9 @@ Description=Aminda's deduplication service
[Service]
Type=oneshot
TimeoutStartSec=infinity
ExecStart=-/usr/bin/duperemove -rdhq --hashfile=/root/home.hash /home
ExecStart=-/usr/bin/duperemove -rdhq --hashfile=/root/usr-local-bin.hash /usr/local/bin
ExecStart=-/usr/bin/duperemove -rdhq --hashfile=/root/flatpak.hash /var/lib/flatpak
ExecStart=-/usr/bin/duperemove -rdhq --hashfile=/root/snap.hash /var/lib/snapd
ExecStart=-/usr/sbin/duperemove -rdhq --hashfile=/root/home.hash /home
ExecStart=-/usr/sbin/duperemove -rdhq --hashfile=/root/flatpak.hash /var/lib/flatpak
ExecStart=-/usr/sbin/duperemove -rdhq --hashfile=/root/snap.hash /var/lib/snapd
User=root
StandardOutput=journal
StandardError=journal

View File

@ -55,6 +55,10 @@ if hash pre-commit 2>/dev/null; then
pre-commit gc
fi
if [ -f $HOME/.MIKAELAGREP ]; then
mv $HOME/.MIKAELAGREP $MIKAELA_GREP
fi
if [ -f "$MIKAELA_GREP" ]; then
bash -x .mikaela_install
fi

View File

@ -1,7 +0,0 @@
{
"devDependencies": {
"prettier": "3.2.5",
"prettier-plugin-nginx": "1.0.3",
"prettier-plugin-toml": "2.0.1"
}
}

70
pnpm-lock.yaml generated
View File

@ -1,70 +0,0 @@
lockfileVersion: "9.0"
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
importers:
.:
devDependencies:
prettier:
specifier: 3.2.5
version: 3.2.5
prettier-plugin-nginx:
specifier: 1.0.3
version: 1.0.3
prettier-plugin-toml:
specifier: 2.0.1
version: 2.0.1(prettier@3.2.5)
packages:
"@taplo/core@0.1.1":
resolution:
{
integrity: sha512-BG/zLGf5wiNXGEVPvUAAX/4ilB3PwDUY2o0MV0y47mZbDZ9ad9UK/cIQsILat3bqbPJsALVbU6k3cskNZ3vAQg==,
}
"@taplo/lib@0.4.0-alpha.2":
resolution:
{
integrity: sha512-DV/Re3DPVY+BhBtLZ3dmP4mP6YMLSsgq9qGLXwOV38lvNF/fBlgvQswzlXmzCEefL/3q2eMoefZpOI/+GLuCNA==,
}
prettier-plugin-nginx@1.0.3:
resolution:
{
integrity: sha512-vV5q85s8XnV6NEgvz1gVLfZhmxAxY03MyOYj2ApBpjFkbs00lRsRkTmqO9L39ADuD18z1RRCcfZ3eVxKhI/nqg==,
}
prettier-plugin-toml@2.0.1:
resolution:
{
integrity: sha512-99z1YOkViECHtXQjGIigd3talI/ybUI1zB3yniAwUrlWBXupNXThB1hM6bwSMUEj2/+tomTlMtT98F5t4s8IWA==,
}
engines: { node: ">=16.0.0" }
peerDependencies:
prettier: ^3.0.3
prettier@3.2.5:
resolution:
{
integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==,
}
engines: { node: ">=14" }
hasBin: true
snapshots:
"@taplo/core@0.1.1": {}
"@taplo/lib@0.4.0-alpha.2":
dependencies:
"@taplo/core": 0.1.1
prettier-plugin-nginx@1.0.3: {}
prettier-plugin-toml@2.0.1(prettier@3.2.5):
dependencies:
"@taplo/lib": 0.4.0-alpha.2
prettier: 3.2.5
prettier@3.2.5: {}