Compare commits

...

5 Commits

4 changed files with 108 additions and 45 deletions

View File

@ -10,7 +10,7 @@
],
[
"trustedListPrefixes",
"-"
"adnauseam- ublock-"
],
[
"uiPopupConfig",
@ -54,7 +54,7 @@
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener-AffiliateTagAllowlist.txt",
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener.txt",
"https://secure.fanboy.co.nz/fanboy-annoyance.txt",
"https://www.eff.org/files/effdntlist.txt",
"eff-dnt-whitelist",
"https://big.oisd.nl",
"ublock-abuse",
"ublock-badware",
@ -100,6 +100,30 @@
[
"prefetchingDisabled",
"true"
],
[
"firstInstall",
"false"
],
[
"hidingAds",
"true"
],
[
"clickingAds",
"true"
],
[
"blockingMalware",
"true"
],
[
"disableHidingForDNT",
"true"
],
[
"disableClickingForDNT",
"true"
]
]
},

View File

@ -7,7 +7,43 @@
"caoacbimdbbljakfhgikoodekdnlcgpk": {
"hasSeenPostInstall": true
},
"cjpalhdlnbpafiamejdnhcphjbkeiagm": {
"ddkjiahejlhfcafbddmgiahcphecmpfh": {
"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
},
"mlojlfildnehdpnlmpkeiiglhhkofhpb": {
"advancedSettings": [
[
"filterAuthorMode",
@ -15,7 +51,7 @@
],
[
"trustedListPrefixes",
"-"
"adnauseam- ublock-"
],
[
"uiPopupConfig",
@ -59,14 +95,18 @@
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener-AffiliateTagAllowlist.txt",
"https://raw.githubusercontent.com/DandelionSprout/adfilt/master/LegitimateURLShortener.txt",
"https://secure.fanboy.co.nz/fanboy-annoyance.txt",
"https://www.eff.org/files/effdntlist.txt",
"eff-dnt-whitelist",
"https://big.oisd.nl",
"ublock-abuse",
"ublock-badware",
"ublock-filters",
"ublock-privacy",
"ublock-quick-fixes",
"ublock-unbreak"
"ublock-unbreak",
"user-filters",
"adnauseam-filters",
"easyprivacy",
"urlhaus-1"
]
},
"userSettings": [
@ -101,45 +141,33 @@
[
"prefetchingDisabled",
"true"
],
[
"firstInstall",
"false"
],
[
"hidingAds",
"true"
],
[
"clickingAds",
"true"
],
[
"blockingMalware",
"true"
],
[
"disableHidingForDNT",
"true"
],
[
"disableClickingForDNT",
"true"
]
]
},
"ddkjiahejlhfcafbddmgiahcphecmpfh": {
"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
},
"nngceckbapebfimnlniiiahkandclblb": {
"environment": {
"base": "https://vault.bitwarden.eu",
@ -256,7 +284,7 @@
},
"cjpalhdlnbpafiamejdnhcphjbkeiagm": {
"blocked_install_message": "uBlock Origin",
"installation_mode": "force_installed",
"installation_mode": "allowed",
"override_update_url": true,
"toolbar_pin": "force_pinned",
"update_url": "https://clients2.google.com/service/update2/crx"
@ -403,7 +431,7 @@
},
"mlojlfildnehdpnlmpkeiiglhhkofhpb": {
"blocked_install_message": "AdNauseam (Edge). Protest tool requiring weakening security and incompatible with other forced extensions.",
"installation_mode": "blocked",
"installation_mode": "normal_installed",
"override_update_url": true,
"toolbar_pin": "force_pinned",
"update_url": "https://edge.microsoft.com/extensionwebstorebase/v1/crx"
@ -445,7 +473,7 @@
},
"odfafepnkmbhccpbejgmiehpchacaeak": {
"blocked_install_message": "uBlock Origin (Edge). Already force_installed from Chrome",
"installation_mode": "blocked",
"installation_mode": "allowed",
"override_update_url": true,
"toolbar_pin": "force_pinned",
"update_url": "https://edge.microsoft.com/extensionwebstorebase/v1/crx"

View File

@ -21,6 +21,8 @@ ExecStart=-systemctl --global enable systemd-tmpfiles-clean.timer systemd-tmpfil
ExecStart=-systemctl restart yggdrasil.service
ExecStart=-firewall-cmd --reload
# If they somehow managed to not start already
ExecStart=-systemctl enable --now ssh.socket
ExecStart=-systemctl enable --now sshd.socket
ExecStart=-systemctl enable --now unbound.service
ExecStart=-systemctl enable --now systemd-resolved.service
ExecStart=-tlp setcharge

View File

@ -202,6 +202,15 @@ if [ "$(id -u)" == "0" ]; then
(systemctl enable --now avahi-daemon.socket &)
(systemctl enable --now systemd-oomd.socket &)
(systemctl enable --now oidentd.socket &)
# sshd is critical and I don't want it to fail due to the service holding the listener
if [ -f /etc/systemd/system/sockets.target.wants/ssh.socket ]; then
(systemctl disable --now ssh.service &)
(systemctl enable --now ssh.socket &)
elif [ -f /etc/systemd/system/sockets.target.wants/sshd.socket ]; then
(systemctl disable --now sshd.service &)
(systemctl enable --now sshd.socket &)
fi
fi
# Enables laziness on checking whether or not apt is installed