update submodules

etc/opt/chromium/policies/managed/README.md

@@ -12,23 +12,6 @@
 
 - [`amber-theme-colour.json.sample`](#amber-theme-colourjsonsample)
 - [`aminda-extensions.json`](#aminda-extensionsjson)
-  - [3rdparty](#3rdparty)
-  - [Silk - Privacy Pass Client for the browser](#silk---privacy-pass-client-for-the-browser)
-  - [QR Code](#qr-code)
-  - [Plasma Integration](#plasma-integration)
-  - [uBlock Origin](#ublock-origin)
-  - [LocalCDN](#localcdn)
-  - [Ruffle](#ruffle)
-  - [HTTP Indicator](#http-indicator)
-  - [Fedora User Agent](#fedora-user-agent)
-  - [Snowflake](#snowflake)
-  - [IPvFooBar](#ipvfoobar)
-  - [uBlock Origin Lite](#ublock-origin-lite)
-  - [AdNauseam](#adnauseam)
-  - [RegretsReporter](#regretsreporter)
-  - [uBlock Origin](#ublock-origin-1)
-  - [Bitwarden](#bitwarden)
-  - [Privacy Badger](#privacy-badger)
 - [`black-theme-colour.json.sample`](#black-theme-colourjsonsample)
 - [`brave-shields-disabled.json`](#brave-shields-disabledjson)
 - [`disable-brave-ipfs.json`](#disable-brave-ipfsjson)
@@ -89,6 +72,10 @@ even overlapping extensions, but there is an important side goal of _teaching
 users to disable extraneous extensions they don't need_ (unless I decide they
 do need something and thus it's `force_installed`.
 
+**_Explanations have moved to `aminda-extensions.tsv`!_**
+
+<!--
+
 ### 3rdparty
 
 - `bkdgflcldnnnapblkhphbgpggdiikppg` - DuckDuckGo
@@ -197,6 +184,8 @@ See also:
 - https://github.com/EFForg/privacybadger/blob/master/doc/admin-deployment.md
 - https://github.com/EFForg/privacybadger/blob/master/src/data/schema.json
 
+-->
+
 ## `black-theme-colour.json.sample`
 
 Sets the theme colour as black. This is managed instead of recommended,

etc/opt/chromium/policies/managed/aminda-extensions.json

@@ -133,6 +133,25 @@
       "toolbar_pin": "force_pinned",
       "update_url": "https://clients2.google.com/service/update2/crx"
     },
+    "fllaojicojecljbmefodhfapmkghcbnh": {
+      "installation_mode": "force_installed",
+      "override_update_url": true,
+      "toolbar_pin": "default_unpinned",
+      "update_url": "https://clients2.google.com/service/update2/crx"
+    },
+    "gbiekjoijknlhijdjbaadobpkdhmoebb": {
+      "installation_mode": "force_installed",
+      "override_update_url": true,
+      "toolbar_pin": "default_unpinned",
+      "update_url": "https://clients2.google.com/service/update2/crx"
+    },
+    "gecgipfabdickgidpmbicneamekgbaej": {
+      "blocked_install_message": "Harhaanjohtava, ei koske PWA vaan vanhentuneita Chrome-sovelluksia.",
+      "installation_mode": "blocked",
+      "override_update_url": true,
+      "toolbar_pin": "force_pinned",
+      "update_url": "https://clients2.google.com/service/update2/crx"
+    },
     "gphhapmejobijbbhgpjhcjognlahblep": {
       "blocked_install_message": "Tämä on KDE-talous, jossa kukaan ei tietääkseni käytä GNOMEa. Tämä lisäosa KDEn vastaavasta poiketen on riippuvainen GNOMEsta.",
       "installation_mode": "blocked"

etc/opt/chromium/policies/managed/aminda-extensions.tsv

@@ -0,0 +1,23 @@
+ID	Name	Comment
+ajhmfdgkijocedmfjonnpjfojldioehi	Silk	
+bkdgflcldnnnapblkhphbgpggdiikppg	DuckDuckGo	
+caoacbimdbbljakfhgikoodekdnlcgpk	DuckDuckGo	
+cbimgpnbgalffiohilfglgkkhpegpjlo	QR Code	
+cimiefiiaegbelhefglklhhakcgmhkai	Plasma Integration	
+cjpalhdlnbpafiamejdnhcphjbkeiagm	uBlock Origin	
+ddkjiahejlhfcafbddmgiahcphecmpfh	uBlock Origin Lite	
+donbcfbmhbcapadipfkeojnmajbakjdc	Ruffle	
+fllaojicojecljbmefodhfapmkghcbnh	Google Analytics opt-out	Opting out of Google Analytics even if I allowlisted some site using it in content filter
+gbiekjoijknlhijdjbaadobpkdhmoebb	Google IBA opt-out	Preparing for eventuality of Google killing adblockers by opting into non-targeted ads instead.
+gecgipfabdickgidpmbicneamekgbaej	Chrome Apps Launcher	BLOCKED. It means the ages ago deprecated Chrome apps, not PWAs.
+hgcomhbcacfkpffiphlmnlhpppcjgmbl	HTTP Indicator	
+hojggiaghnldpcknpbciehjcaoafceil	Fedora User Agent	
+iimpkhokkfekbpmoamlmcndclohnehhk	IPVFooBar	
+mafpmfcccpbjnhfhjnllmmalhifmlcie	Tor Snowflake	
+mlojlfildnehdpnlmpkeiiglhhkofhpb	AdNauseam	
+mlojlfildnehdpnlmpkeiiglhhkofhpb	Ad Nauseam	
+njdfdhgcmkocbgbhcioffdbicglldapd	LocalCDN	
+nngceckbapebfimnlniiiahkandclblb	Bitwarden	
+obpoeflheeknapimliioeoefbfaakefn	Regrets Reporter	
+odfafepnkmbhccpbejgmiehpchacaeak	uBlock Origin	
+pkehgijcmpdhfbdbbnkijodmdjhbjlgp	PrivacyBadger	

etc/profile.d/99-wayland.sh

@@ -1,5 +1,8 @@
-export QT_STYLE_OVERRIDE=kvantum
-export QT_QPA_PLATFORMTHEME="kde"
+unset QT_QPA_PLATFORMTHEME
+unset QT_STYLE_OVERRIDE
+export XDG_CURRENT_DESKTOP=KDE
+export XDG_SESSION_DESKTOP=KDE
+# Strongly imply these that wayland is preferred
 export GDK_BACKEND=wayland
 export QT_QPA_PLATFORM=wayland
 export CLUTTER_BACKEND=wayland

etc/systemd/system/aminda-nocron-reboot.service

@@ -15,12 +15,21 @@ ExecStartPre=-/usr/bin/systemctl start firewalld.service
 # https://github.com/systemd/zram-generator
 #ExecStart=-/usr/bin/systemctl start /dev/zram0
 ExecStart=-/usr/bin/systemctl enable --now systemd-zram-setup@zram0.service
-# Ensure we really allow ICMPv6 on FEDORA (or firewalld)
+# Ensure we really allow ICMPv6 on FEDORA (or firewalld). Also other essential services.
 ExecStart=-/usr/bin/firewall-cmd --add-protocol=ipv6-icmp
+ExecStart=-/usr/bin/firewall-cmd --add-service=ssh --permanent
+ExecStart=-/usr/bin/firewall-cmd --add-service=mosh --permanent
+ExecStart=-/usr/bin/firewall-cmd --add-service=ntp --permanent
+ExecStart=-/usr/bin/firewall-cmd --add-service=syncthing --permanent
+ExecStart=-/usr/bin/firewall-cmd --add-service=mdns --permanent
+ExecStart=-/usr/bin/firewall-cmd --add-service=kdeconnect --permanent
+ExecStart=-/usr/bin/firewall-cmd --permanent --add-port=9001/udp
+ExecStart=-/usr/bin/firewall-cmd --permanent --add-port=6771/udp
 # 3rd party Xbox controller initialization. See Mikaela/gist/gayming/
 #ExecStart=-/root/fixcontroller.py
 # This is actually in the delayed variant of this service, but anyway
-ExecStart=-/usr/bin/systemctl start yggdrasil.service
+ExecStart=-/usr/bin/systemctl enable --now yggdrasil.service
+ExecStart=-/usr/bin/systemctl enable --now sshguard.service
 User=root
 StandardOutput=journal
 StandardError=journal

etc/systemd/system/aminda-nocron-rebootish.service

@@ -8,6 +8,7 @@ TimeoutStartSec=infinity
 # Another attempt at ensuring Yggdrasil works with nordvpnd
 ExecStartPre=-/usr/sbin/sysctl net.ipv6.conf.all.disable_ipv6=0
 ExecStart=-/usr/bin/systemctl restart yggdrasil.service
+ExecStart=-/bin/firewall-cmd --reload
 # If they somehow managed to not start already
 ExecStart=-/usr/bin/systemctl enable --now unbound.service
 ExecStart=-/usr/bin/systemctl enable --now systemd-resolved.service

local/share/dark-mode.d/.gitignore

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+exit 0

local/share/dark-mode.d/00-do-not-repeat-yourself.bash

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+set -x
+
+if ! hash lsb_release 2> /dev/null; then
+	ERRORMESSAGE="lsb_release was not found, the wallpaper scripts cannot figure out the distribution"
+	echo "$ERRORMESSAGE"
+	notify-send --app-name=darkman --icon=error "$ERRORMESSAGE"
+	exit 0
+fi
+
+#if ! hash kvantummanager 2> /dev/null; then
+#	ERRORMESSAGE="kvantummanager wasn't found, Qt theme switching won't work!"
+#	echo "$ERRORMESSAGE"
+#	notify-send --app-name="darkman" --icon=error "$ERRORMESSAGE"
+#	exit 0
+#fi
+
+export DISTROID="$(lsb_release -si)"
+export DISTROREL="$(lsb_release -sr)"
+
+export DARKMANGET="$(darkman get)"
+
+printf "Distribution: $DISTROID\nRelease: $DISTROREL\nMode: $DARKMANGET\n"
+
+if [[ "$DARKMANGET" -eq "dark" ]]; then
+	notify-send --app-name="darkman" --urgency=low --icon=weather-clear-night "Teema: $DARKMANGET"
+elif [[ "$DARKMANGET" -eq "light" ]]; then
+	notify-send --app-name="darkman" --urgency=low --icon=weather-clear "Teema: $DARKMANGET"
+else
+	ERRORMESSAGE="Something went wrong?"
+	echo "$ERRORMESSAGE"
+	notify-send --app-name="darkman" --icon=error "$ERRORMESSAGE"
+fi
+
+#if [[ "$QT_STYLE_OVERRIDE" != "kvantum" ]]; then
+#	ERRORMESSAGE="\$QT_STYLE_OVERRIDE is not 'kvantum', Qt theme switching has no effect!"
+#	echo $ERRORMESSAGE
+#	notify-send --app-name="darkman" --icon=error "$ERRORMESSAGE"
+#	exit 0
+#fi

local/share/dark-mode.d/00-do-not-repeat-yourself.sh

@@ -1,37 +0,0 @@
-if ! hash lsb_release 2> /dev/null; then
-	ERRORMESSAGE="lsb_release was not found, the wallpaper scripts cannot figure out the distribution"
-	echo $ERRORMESSAGE
-	notify-send --app-name=darkman --icon=error $ERRORMESSAGE
-	exit 0
-fi
-
-if ! hash kvantummanager 2> /dev/null; then
-	ERRORMESSAGE="kvantummanager wasn't found, Qt theme switching won't work!"
-	echo $ERRORMESSAGE
-	notify-send --app-name="darkman" --icon=error $ERRORMESSAGE
-	exit 0
-fi
-
-export DISTROID=$(lsb_release -si)
-export DISTROREL=$(lsb_release -sr)
-
-export DARKMANGET=$(darkman get)
-
-printf "Distribution: $DISTROID\nRelease: $DISTROREL\nMode: $DARKMANGET\n"
-
-if [[ "$DARKMANGET" == "dark" ]]; then
-	(notify-send --app-name="darkman" --urgency=low --icon=weather-clear-night "Teema: $DARKMANGET" &)
-elif [[ "$DARKMANGET" == "light" ]]; then
-	(notify-send --app-name="darkman" --urgency=low --icon=weather-clear "Teema: $DARKMANGET" &)
-else
-	ERRORMESSAGE="Something went wrong?"
-	echo $ERRORMESSAGE
-	notify-send --app-name="darkman" --icon=error $ERRORMESSAGE
-fi
-
-if [[ "$QT_STYLE_OVERRIDE" != "kvantum" ]]; then
-	ERRORMESSAGE="\$QT_STYLE_OVERRIDE is not 'kvantum', Qt theme switching has no effect!"
-	echo $ERRORMESSAGE
-	notify-send --app-name="darkman" --icon=error $ERRORMESSAGE
-	exit 0
-fi

local/share/dark-mode.d/10-adwaita-breeze-dark.bash

@@ -1,19 +1,22 @@
 #!/usr/bin/env bash
 
-. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.sh
+. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.bash
 
 # This is all adapted from /usr/share/doc/darkman/examples/dark-mode.d/
 
 # GTK Theme
-(gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' &)
-(gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark &)
-(dbus-send --session --dest=org.kde.GtkConfig --type=method_call /GtkConfig org.kde.GtkConfig.setGtkTheme "string:Adwaita-dark" &)
+sleep 3 && gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
+sleep 1 && gsettings set org.gnome.desktop.interface gtk-theme Breeze
+sleep 2 && gsettings set org.gnome.desktop.interface gtk-theme Breeze-dark
+sleep 1 && dbus-send --session --dest=org.kde.GtkConfig --type=method_call /GtkConfig org.kde.GtkConfig.setGtkTheme "string:Breeze"
+sleep 2 && dbus-send --session --dest=org.kde.GtkConfig --type=method_call /GtkConfig org.kde.GtkConfig.setGtkTheme "string:Breeze-dark"
 
 # Xfce theme?
-(xfconf-query --channel xsettings --create --type string --property /Net/ThemeName --set Adwaita-dark &)
+sleep 1 && xfconf-query --channel xsettings --create --type string --property /Net/ThemeName --set Breeze
+sleep 2 && xfconf-query --channel xsettings --create --type string --property /Net/ThemeName --set Breeze-dark
 
 # Plasma
-(lookandfeeltool --apply "org.kde.breezedark.desktop" &)
+lookandfeeltool --apply "org.kde.breezedark.desktop"
 
 # Kvantum Qt
-(kvantummanager --set KvGnomeDark --noAssign-All &)
+#sleep 3 && kvantummanager --set KvGnomeDark --noAssign-All

local/share/dark-mode.d/13-plasma-distro-themes.bash

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.sh
+. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.bash
 
 if [[ "$DISTROID" == "Kali" ]]; then
 	lookandfeeltool --apply "Kali-Purple-Dark"

local/share/dark-mode.d/15-wallpaper-dark.bash

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.sh
+. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.bash
 
 if [ -f ~/.wallpaper.dark ]; then
 	export WALLPAPER_PATH="$HOME/.wallpaper.dark"

local/share/light-mode.d/.gitignore

@@ -1 +1,3 @@
-00-do-not-repeat-yourself.sh
+#!/usr/bin/env bash
+exit 0
+00-do-not-repeat-yourself.bash

local/share/light-mode.d/00-do-not-repeat-yourself.bash

@@ -0,0 +1 @@
+../dark-mode.d/00-do-not-repeat-yourself.bash

local/share/light-mode.d/00-do-not-repeat-yourself.sh

@@ -1 +0,0 @@
-../dark-mode.d/00-do-not-repeat-yourself.sh

local/share/light-mode.d/10-breeze.bash

@@ -1,19 +1,19 @@
 #!/usr/bin/env bash
 
-. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.sh
+. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.bash
 
 # This is all adapted from /usr/share/doc/darkman/examples/light-mode.d/
 
 # GTK Theme
-(gsettings set org.gnome.desktop.interface color-scheme 'prefer-light' &)
-(gsettings set org.gnome.desktop.interface gtk-theme Breeze &)
-(dbus-send --session --dest=org.kde.GtkConfig --type=method_call /GtkConfig org.kde.GtkConfig.setGtkTheme "string:Breeze" &)
+gsettings set org.gnome.desktop.interface color-scheme 'prefer-light'
+gsettings set org.gnome.desktop.interface gtk-theme Breeze
+dbus-send --session --dest=org.kde.GtkConfig --type=method_call /GtkConfig org.kde.GtkConfig.setGtkTheme "string:Breeze"
 
 # Xfce theme?
-(xfconf-query --channel xsettings --create --type string --property /Net/ThemeName --set Breeze &)
+xfconf-query --channel xsettings --create --type string --property /Net/ThemeName --set Breeze
 
 # Plasma
-(lookandfeeltool --apply "org.kde.breeze.desktop" &)
+lookandfeeltool --apply "org.kde.breeze.desktop"
 
 # Kvantum Qt
-(kvantummanager --set KvGnome --noAssign-All &)
+#sleep 3 && kvantummanager --set KvGnome --noAssign-All

local/share/light-mode.d/13-plasma-distro-themes.bash

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.sh
+. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.bash
 
 if [[ "$DISTROID" == "Kali" ]]; then
 	lookandfeeltool --apply "Kali-Purple-Light"

local/share/light-mode.d/15-wallpaper-light.bash

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.sh
+. ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.bash
 
 if [ -f ~/.wallpaper.light ]; then
 	export WALLPAPER_PATH="$HOME/.wallpaper.light"

submodules/jauderho-nts-servers

@@ -1 +1 @@
-Subproject commit 8bdf724242a8f56388aa6f8f526c258c66514de0
+Subproject commit f1781bcf29e312b978f55afa7489a785c3220b3a