Move ublock settings into separate folder, add LibreWolf and some improvements of READMEs

README.md

@@ -4,11 +4,6 @@ The following is a brief collection of scripts and settings to easily apply more
 
 Don't give your data away, fight for your digital rights _now_!
 
-This collection is heavily based on the following sites. It's recommended to read them if possible.
-
-* [kuketz-blog.de (german)](https://www.kuketz-blog.de/empfehlungsecke/)
-* [privacy-handbuch.de (german)](https://www.privacy-handbuch.de/)
-
 ## Links
 
 Here are some additional links to think about. Most of them are in German.

firefox/README.md

@@ -6,6 +6,8 @@ Why Firefox? It provides high configurability, is open source and thus better to
 
 Mainly based on [arkenfox](https://github.com/arkenfox/user.js) with some [custom overrides](https://github.com/arkenfox/user.js/wiki/3.1-Overrides).
 
+An alternative is [LibreWolf](./../librewolf/) which comes with a lot of settings by default.
+
 - [README](#readme)
   - [Install](#install)
   - [Custom overrides](#custom-overrides)
@@ -40,11 +42,11 @@ they're applied to ease browsing without sacrificing too much security or are ju
 
 ## Recommended extensions
 
-Besides Firefox integrated anti-tracking mechanisms, it's still advised to install additional plugins to further enhance this.
+Besides Firefox's integrated anti-tracking mechanisms, it's still advised to install additional plugins to further enhance this.
 
 In addition, some of those extensions will also greatly improve your user experience: fewer ads, faster page loads. Remember, you can also switch them off (disable), you don't need to uninstall.
 
-**Highly recommended to have all of them allowed in Incognito Mode as well (Maybe except for LocalCDN if desired)!**
+**Highly recommended to have all of them allowed in Incognito Mode as well.**
 
 See [arkenfox extensions recommendations](https://github.com/arkenfox/user.js/wiki/4.1-Extensions).
 
@@ -58,7 +60,7 @@ You can **hide extension icons** in the overflow menu if you like. Just right cl
 
 #### uBlock settings
 
-* Import the `ublock-config-1.txt` in the "My Filter" menu for proper settings from the [extension_settings/](./extension_settings/) folder within the extension.
+* Import the `ublock.txt` in the "My Filter" menu for proper settings from the [extension_settings/](./../browser_extension_settings/) folder within the extension.
 * Import `https://raw.githubusercontent.com/gwarser/filter-lists/master/lan-block.txt` in "Filter lists" (Custom)
 
 ### Advanced, but highly recommended extensions / software to use

librewolf/README.md

@@ -0,0 +1,66 @@
+# README
+
+By default, LibreWolf is probably the better choice over Firefox as it already disables most of telemetry and tracking.
+
+## Install
+
+Get LibreWolf from website.
+
+Add the `librewolf.overrides.cfg` to the `$HOME/.librewolf` folder and adapt to your needs.
+
+Remove leading `//` to enable a setting. You need to restart (all instances of) LibreWolf afterwards. You can cross-check if they have been applied by typing `about:config` in the browser navigation bar and search for the setting.
+
+## Recommended extensions
+
+Besides LibreWolf's integrated anti-tracking mechanisms, it's still advised to install additional plugins to further enhance this.
+
+In addition, some of those extensions will also greatly improve your user experience: fewer ads, faster page loads. Remember, you can also switch them off (disable), you don't need to uninstall.
+
+**Highly recommended to have all of them allowed in Incognito Mode as well.**
+
+See [arkenfox extensions recommendations](https://github.com/arkenfox/user.js/wiki/4.1-Extensions).
+
+### Must have
+
+* `uBlock Origin`: blocks ads and unwanted trackers, also removes certain url parameters (https://addons.mozilla.org/de/firefox/addon/ublock-origin/)
+
+**Hint**: Extensions impacting redirects or cookies _might_ lead to malfunctioning of some websites. If you encounter this, it's **recommended to disable them _per page_** and **NOT** globally! First could shot can be setting an exception for a page inside uBlock.!
+
+You can **hide extension icons** in the overflow menu if you like. Just right click the icon in the top right in the menu bar and "pin to overflow".
+
+#### uBlock settings
+
+* Import the `ublock.txt` in the "My Filter" menu for proper settings from the [extension_settings/](./../browser_extension_settings/) folder within the extension.
+* Import `https://raw.githubusercontent.com/gwarser/filter-lists/master/lan-block.txt` in "Filter lists" (Custom)
+
+### Advanced, but highly recommended extensions / software to use
+
+Use a password manager and don't store or synchronize your passwords within internal browser functionality, e.g., `KeePassXC` or `Bitwarden` with a custom provider
+
+## Recommended search engines
+
+If not possible in another way, you can add them via [Add custom search engine](https://addons.mozilla.org/en-US/firefox/addon/add-custom-search-engine/). Just follow instructions after installing and opening the extension.
+
+```shell
+# Tied to "Germany" for search results, maybe you like to change this
+# Then generate a different URL
+https://duckduckgo.com/?q=%s&ks=l&kav=1&kn=1&kp=-2&kak=-1&kax=-1&kaq=-1&kao=-1&kau=-1&kaj=m&kam=google-maps&k1=-1&kae=c
+```
+
+```shell
+# Tied to "Germany" for search results, maybe you like to change this
+# Then generate a different URL
+https://www.qwant.com/?q=%s&r=DE&sr=de&l=en_gb&h=1&s=0&a=1&b=1&vt=0&hc=0&smartNews=0&smartSocial=0&theme=0&i=1&donation=0&qoz=0&shb=0&shl=0
+```
+
+```shell
+# Tied to "Germany" for search results, maybe you like to change this
+# Then generate a different URL
+https://duckduckgo.com/?q=%s&ks=l&kav=1&kn=1&kp=-2&kak=-1&kax=-1&kaq=-1&kao=-1&kau=-1&kaj=m&kam=google-maps&k1=-1&kae=c
+```
+
+Be sure to add shortcuts to be used in your navigation bar, e.g. `@ddg` refers to DuckDuckGo search engine and directly issues searches to DuckDuckGo from the navigation bar and does not use the default search engine, but your default!
+
+## Additional hints
+
+Besides securing LibreWolf, you should consider not using the DNS servers of your Internet provider and instead install system-wide [DNS alternatives](https://www.kuketz-blog.de/empfehlungsecke/#dns) or a [local DNS server](https://wiki.archlinux.org/index.php/Unbound) which directly queries root DNS servers. There's really no downside of this.

librewolf/librewolf.overrides.cfg

@@ -0,0 +1,46 @@
+// From Librewolf FAQ
+//defaultPref("identity.fxaccounts.enabled", true);
+//defaultPref("browser.sessionstore.resume_from_crash", false);
+
+/* Migrated from Arkenfox overrides */
+
+/* Avoid non-playing, see https://bugs.launchpad.net/ubuntu/+source/firefox/+bug/1874808  */
+defaultPref("media.autoplay.blocking_policy", 1);
+
+/* Keep history */
+//defaultPref("privacy.clearOnShutdown.history", false);
+
+/* Disable logins */
+defaultPref("services.sync.engine.passwords", false);
+
+/* Disable translations */
+defaultPref("browser.translations.automaticallyPopup", false);
+defaultPref("browser.translations.enable", false);
+
+/* Enable faster scroll */
+defaultPref("general.smoothScroll", false);
+defaultPref("general.smoothScroll.pages", false);
+defaultPref("mousewheel.min_line_scroll_amount", 40);
+
+/* Enable green icons again */
+defaultPref("security.secure_connection_icon_color_gray", false);
+defaultPref("security.insecure_connection_icon.enabled", true);
+defaultPref("security.insecure_connection_icon.pbmode.enabled", true);
+defaultPref("security.insecure_connection_text.enabled", true);
+defaultPref("security.insecure_connection_text.pbmode.enabled", true);
+
+/* DNS over HTTPS
+   adjust the following to your liking
+   0 = use system DNS, 2 = use DNS-over-HTTPS resolver, select one in UI under network, otherwise you might end up with cloudflare
+*/
+defaultPref("network.trr.mode", 1);
+defaultPref("network.trr.uri", "");
+defaultPref("network.trr.resolvers", '[]');
+defaultPref("network.trr.excluded-domains", "fritz.box,fritz.nas");
+defaultPref("network.dns.disableIPv6", false);
+defaultPref("network.dns.disablePrefetch", false);
+
+/* override recipe: RFP is not for me ***/
+//defaultPref("privacy.resistFingerprinting", false); // 4501
+//defaultPref("privacy.resistFingerprinting.letterboxing", false); // 4504 [pointless if not using RFP]
+//defaultPref("webgl.disabled", false); // 4520 [mostly pointless if not using RFP]