2023-12-18

5 files changed, 55 insertions, 234 deletions

diff --git a/modules/nixos/common/systemd.nix b/modules/nixos/common/systemd.nix
index f3d5217..3972670 100644
--- a/modules/nixos/common/systemd.nix
+++ b/modules/nixos/common/systemd.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   ark = {
     files = ["/etc/machine-id"];
     directories = ["/var/lib/systemd/coredump"];
@@ -8,6 +12,14 @@
 
   hm.systemd.user.startServices = "sd-switch";
 
+  boot.initrd.systemd = {
+    enable = true;
+    network = {
+      inherit (config.systemd.network) enable;
+      wait-online.enable = false;
+    };
+  };
+
   services.journald.extraConfig = ''
     SystemMaxUse=5G
   '';
diff --git a/modules/nixos/firefox/addons.json b/modules/nixos/firefox/addons.json
index 68c2f86..09c7f0f 100644
--- a/modules/nixos/firefox/addons.json
+++ b/modules/nixos/firefox/addons.json
@@ -13,8 +13,7 @@
     "slug": "darkreader"
   },
   {
-    "pname": "dont-track-me-google",
-    "slug": "dont-track-me-google1"
+    "slug": "font-fingerprint-defender"
   },
   {
     "slug": "furiganaize"
diff --git a/modules/nixos/firefox/addons.nix b/modules/nixos/firefox/addons.nix
index 544b5cd..a38e6d4 100644
--- a/modules/nixos/firefox/addons.nix
+++ b/modules/nixos/firefox/addons.nix
@@ -4,10 +4,10 @@
 }: {
   "bitwarden" = buildFirefoxXpiAddon {
     pname = "bitwarden";
-    version = "2023.10.2";
+    version = "2023.12.0";
     addonId = "{446900e4-71c2-419f-a6a7-df9c091e268b}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4191732/bitwarden_password_manager-2023.10.2.xpi";
-    sha256 = "3eac55c07a2802a6192e2788da86578d45158fca21ccdeb521e5281137ecc24a";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4205620/bitwarden_password_manager-2023.12.0.xpi";
+    sha256 = "f3e508d10c7bbd03890235354355c4bc526db24ebe241ce16630f272614258f4";
     meta = with lib; {
       homepage = "https://bitwarden.com";
       description = "A secure and free password manager for all of your devices.";
@@ -68,10 +68,10 @@
   };
   "darkreader" = buildFirefoxXpiAddon {
     pname = "darkreader";
-    version = "4.9.70";
+    version = "4.9.73";
     addonId = "addon@darkreader.org";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4198549/darkreader-4.9.70.xpi";
-    sha256 = "3ccbe247031dd4fcc3d9bd840872ed38e9843729709f92803c234041070588a7";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4205543/darkreader-4.9.73.xpi";
+    sha256 = "7c399ff32561886bb80dad0cafaf8f629792b0b71ff1efcf12667e05a2b38f1a";
     meta = with lib; {
       homepage = "https://darkreader.org/";
       description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing.";
@@ -87,213 +87,17 @@
       platforms = platforms.all;
     };
   };
-  "dont-track-me-google" = buildFirefoxXpiAddon {
-    pname = "dont-track-me-google";
-    version = "4.28";
-    addonId = "dont-track-me-google@robwu.nl";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4132891/dont_track_me_google1-4.28.xpi";
-    sha256 = "25bc90005d6f28d53182ef48c7efcbba72b198ce67cf1f0747dbd23d43078b26";
+  "font-fingerprint-defender" = buildFirefoxXpiAddon {
+    pname = "font-fingerprint-defender";
+    version = "0.1.4";
+    addonId = "{96ef5869-e3ba-4d21-b86e-21b163096400}";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4028360/font_fingerprint_defender-0.1.4.xpi";
+    sha256 = "845e2d1e9fde67d21a6f4c2b0ed8bd81e81829883aca99f9569919abc06e9b34";
     meta = with lib; {
-      homepage = "https://github.com/Rob--W/dont-track-me-google";
-      description = "Removes the annoying link-conversion at Google Search / maps / ...";
-      license = licenses.mit;
-      mozPermissions = [
-        "storage"
-        "*://*.google.com/*"
-        "*://*.google.ad/*"
-        "*://*.google.ae/*"
-        "*://*.google.com.af/*"
-        "*://*.google.com.ag/*"
-        "*://*.google.com.ai/*"
-        "*://*.google.al/*"
-        "*://*.google.am/*"
-        "*://*.google.co.ao/*"
-        "*://*.google.com.ar/*"
-        "*://*.google.as/*"
-        "*://*.google.at/*"
-        "*://*.google.com.au/*"
-        "*://*.google.az/*"
-        "*://*.google.ba/*"
-        "*://*.google.com.bd/*"
-        "*://*.google.be/*"
-        "*://*.google.bf/*"
-        "*://*.google.bg/*"
-        "*://*.google.com.bh/*"
-        "*://*.google.bi/*"
-        "*://*.google.bj/*"
-        "*://*.google.com.bn/*"
-        "*://*.google.com.bo/*"
-        "*://*.google.com.br/*"
-        "*://*.google.bs/*"
-        "*://*.google.bt/*"
-        "*://*.google.co.bw/*"
-        "*://*.google.by/*"
-        "*://*.google.com.bz/*"
-        "*://*.google.ca/*"
-        "*://*.google.cd/*"
-        "*://*.google.cf/*"
-        "*://*.google.cg/*"
-        "*://*.google.ch/*"
-        "*://*.google.ci/*"
-        "*://*.google.co.ck/*"
-        "*://*.google.cl/*"
-        "*://*.google.cm/*"
-        "*://*.google.cn/*"
-        "*://*.google.com.co/*"
-        "*://*.google.co.cr/*"
-        "*://*.google.com.cu/*"
-        "*://*.google.cv/*"
-        "*://*.google.com.cy/*"
-        "*://*.google.cz/*"
-        "*://*.google.de/*"
-        "*://*.google.dj/*"
-        "*://*.google.dk/*"
-        "*://*.google.dm/*"
-        "*://*.google.com.do/*"
-        "*://*.google.dz/*"
-        "*://*.google.com.ec/*"
-        "*://*.google.ee/*"
-        "*://*.google.com.eg/*"
-        "*://*.google.es/*"
-        "*://*.google.com.et/*"
-        "*://*.google.fi/*"
-        "*://*.google.com.fj/*"
-        "*://*.google.fm/*"
-        "*://*.google.fr/*"
-        "*://*.google.ga/*"
-        "*://*.google.ge/*"
-        "*://*.google.gg/*"
-        "*://*.google.com.gh/*"
-        "*://*.google.com.gi/*"
-        "*://*.google.gl/*"
-        "*://*.google.gm/*"
-        "*://*.google.gp/*"
-        "*://*.google.gr/*"
-        "*://*.google.com.gt/*"
-        "*://*.google.gy/*"
-        "*://*.google.com.hk/*"
-        "*://*.google.hn/*"
-        "*://*.google.hr/*"
-        "*://*.google.ht/*"
-        "*://*.google.hu/*"
-        "*://*.google.co.id/*"
-        "*://*.google.ie/*"
-        "*://*.google.co.il/*"
-        "*://*.google.im/*"
-        "*://*.google.co.in/*"
-        "*://*.google.iq/*"
-        "*://*.google.is/*"
-        "*://*.google.it/*"
-        "*://*.google.je/*"
-        "*://*.google.com.jm/*"
-        "*://*.google.jo/*"
-        "*://*.google.co.jp/*"
-        "*://*.google.co.ke/*"
-        "*://*.google.com.kh/*"
-        "*://*.google.ki/*"
-        "*://*.google.kg/*"
-        "*://*.google.co.kr/*"
-        "*://*.google.com.kw/*"
-        "*://*.google.kz/*"
-        "*://*.google.la/*"
-        "*://*.google.com.lb/*"
-        "*://*.google.li/*"
-        "*://*.google.lk/*"
-        "*://*.google.co.ls/*"
-        "*://*.google.lt/*"
-        "*://*.google.lu/*"
-        "*://*.google.lv/*"
-        "*://*.google.com.ly/*"
-        "*://*.google.co.ma/*"
-        "*://*.google.md/*"
-        "*://*.google.me/*"
-        "*://*.google.mg/*"
-        "*://*.google.mk/*"
-        "*://*.google.ml/*"
-        "*://*.google.com.mm/*"
-        "*://*.google.mn/*"
-        "*://*.google.ms/*"
-        "*://*.google.com.mt/*"
-        "*://*.google.mu/*"
-        "*://*.google.mv/*"
-        "*://*.google.mw/*"
-        "*://*.google.com.mx/*"
-        "*://*.google.com.my/*"
-        "*://*.google.co.mz/*"
-        "*://*.google.com.na/*"
-        "*://*.google.com.nf/*"
-        "*://*.google.com.ng/*"
-        "*://*.google.com.ni/*"
-        "*://*.google.ne/*"
-        "*://*.google.nl/*"
-        "*://*.google.no/*"
-        "*://*.google.com.np/*"
-        "*://*.google.nr/*"
-        "*://*.google.nu/*"
-        "*://*.google.co.nz/*"
-        "*://*.google.com.om/*"
-        "*://*.google.com.pa/*"
-        "*://*.google.com.pe/*"
-        "*://*.google.com.pg/*"
-        "*://*.google.com.ph/*"
-        "*://*.google.com.pk/*"
-        "*://*.google.pl/*"
-        "*://*.google.pn/*"
-        "*://*.google.com.pr/*"
-        "*://*.google.ps/*"
-        "*://*.google.pt/*"
-        "*://*.google.com.py/*"
-        "*://*.google.com.qa/*"
-        "*://*.google.ro/*"
-        "*://*.google.ru/*"
-        "*://*.google.rw/*"
-        "*://*.google.com.sa/*"
-        "*://*.google.com.sb/*"
-        "*://*.google.sc/*"
-        "*://*.google.se/*"
-        "*://*.google.com.sg/*"
-        "*://*.google.sh/*"
-        "*://*.google.si/*"
-        "*://*.google.sk/*"
-        "*://*.google.com.sl/*"
-        "*://*.google.sn/*"
-        "*://*.google.so/*"
-        "*://*.google.sm/*"
-        "*://*.google.sr/*"
-        "*://*.google.st/*"
-        "*://*.google.com.sv/*"
-        "*://*.google.td/*"
-        "*://*.google.tg/*"
-        "*://*.google.co.th/*"
-        "*://*.google.com.tj/*"
-        "*://*.google.tk/*"
-        "*://*.google.tl/*"
-        "*://*.google.tm/*"
-        "*://*.google.tn/*"
-        "*://*.google.to/*"
-        "*://*.google.com.tr/*"
-        "*://*.google.tt/*"
-        "*://*.google.com.tw/*"
-        "*://*.google.co.tz/*"
-        "*://*.google.com.ua/*"
-        "*://*.google.co.ug/*"
-        "*://*.google.co.uk/*"
-        "*://*.google.com.uy/*"
-        "*://*.google.co.uz/*"
-        "*://*.google.com.vc/*"
-        "*://*.google.co.ve/*"
-        "*://*.google.vg/*"
-        "*://*.google.co.vi/*"
-        "*://*.google.com.vn/*"
-        "*://*.google.vu/*"
-        "*://*.google.ws/*"
-        "*://*.google.rs/*"
-        "*://*.google.co.za/*"
-        "*://*.google.co.zm/*"
-        "*://*.google.co.zw/*"
-        "*://*.google.cat/*"
-        "*://*.google.ng/*"
-      ];
+      homepage = "https://mybrowseraddon.com/font-defender.html";
+      description = "Defending against Font fingerprinting by reporting a fake value.";
+      license = licenses.mpl20;
+      mozPermissions = ["storage" "contextMenus" "notifications" "*://*/*"];
       platforms = platforms.all;
     };
   };
@@ -370,10 +174,10 @@
   };
   "localcdn" = buildFirefoxXpiAddon {
     pname = "localcdn";
-    version = "2.6.59";
+    version = "2.6.60";
     addonId = "{b86e4813-687a-43e6-ab65-0bde4ab75758}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4197044/localcdn_fork_of_decentraleyes-2.6.59.xpi";
-    sha256 = "0aa14f964d0a851151dd8ac5ad87ae9085eea8e44d0d19e3b6b2849f92422721";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4208268/localcdn_fork_of_decentraleyes-2.6.60.xpi";
+    sha256 = "9ffd3609de89b8e0a4c9a425178f5e08b1ed2729fb0dd106320b72bcfc1d3392";
     meta = with lib; {
       homepage = "https://www.localcdn.org";
       description = "Emulates remote frameworks (e.g. jQuery, Bootstrap, AngularJS) and delivers them as local resource. Prevents unnecessary 3rd party requests to Google, StackPath, MaxCDN and more. Prepared rules for uBlock Origin/uMatrix.";
@@ -405,10 +209,10 @@
   };
   "noscript" = buildFirefoxXpiAddon {
     pname = "noscript";
-    version = "11.4.28";
+    version = "11.4.29";
     addonId = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4178438/noscript-11.4.28.xpi";
-    sha256 = "54d076b3226d454216117547f6441d2f95af3057d20f726e55d94b0f22573c14";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.xpi";
+    sha256 = "05b98840b05ef2acbac333543e4b7c3d40fee2ce5fb4e29260b05e2ff6fe24cd";
     meta = with lib; {
       homepage = "https://noscript.net";
       description = "The best security you can get in a web browser! Allow potentially malicious web content to run only from sites you trust. Protect yourself against XSS other web security exploits.";
@@ -431,19 +235,18 @@
   };
   "privacy-badger" = buildFirefoxXpiAddon {
     pname = "privacy-badger";
-    version = "2023.10.31";
+    version = "2023.12.1";
     addonId = "jid1-MnnxcxisBPnSXQ@jetpack";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4188670/privacy_badger17-2023.10.31.xpi";
-    sha256 = "37e96cbd257b73d7350605ed20494a82b578f25a2cefc3de2dab019e5ff6ced1";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4203344/privacy_badger17-2023.12.1.xpi";
+    sha256 = "aacac794c211fc6ea7dc51529883fd3e477aff37441d29ae7f576ab0f8c737b7";
     meta = with lib; {
       homepage = "https://privacybadger.org/";
       description = "Automatically learns to block invisible trackers.";
       license = licenses.gpl3;
       mozPermissions = [
+        "<all_urls>"
         "alarms"
         "tabs"
-        "http://*/*"
-        "https://*/*"
         "webNavigation"
         "webRequest"
         "webRequestBlocking"
@@ -838,7 +641,6 @@
         "http://www.google.co.zw/*"
         "https://www.google.cat/*"
         "http://www.google.cat/*"
-        "<all_urls>"
       ];
       platforms = platforms.all;
     };
@@ -892,10 +694,10 @@
   };
   "rikaichamp" = buildFirefoxXpiAddon {
     pname = "rikaichamp";
-    version = "1.16.0";
+    version = "1.17.0";
     addonId = "{59812185-ea92-4cca-8ab7-cfcacee81281}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4200662/10ten_ja_reader-1.16.0.xpi";
-    sha256 = "ac91a5aee5c6a018c397257eb090eaa640feb0a17aa2e0f91248bad7d1a3e6c1";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4205187/10ten_ja_reader-1.17.0.xpi";
+    sha256 = "b403f9f361f685a8c674d864efc050850b0e4f042a83b906d9828b3835b51db6";
     meta = with lib; {
       homepage = "https://github.com/birchill/10ten-ja-reader/";
       description = "Quickly translate Japanese by hovering over words. Formerly released as Rikaichamp.";
diff --git a/modules/nixos/firefox/default.nix b/modules/nixos/firefox/default.nix
index a5d5c89..73b5b58 100644
--- a/modules/nixos/firefox/default.nix
+++ b/modules/nixos/firefox/default.nix
@@ -110,7 +110,7 @@ in {
                 canvasblocker
                 consent-o-matic
                 darkreader
-                dont-track-me-google
+                font-fingerprint-defender
                 furiganaize
                 languagetool
                 localcdn
diff --git a/modules/nixos/firefox/userContent.css b/modules/nixos/firefox/userContent.css
index 82940ec..544539f 100644
--- a/modules/nixos/firefox/userContent.css
+++ b/modules/nixos/firefox/userContent.css
@@ -16,6 +16,14 @@
     }
 }
 
+@-moz-document regexp("https?://.*")
+{
+    iframe[src^="https://accounts.google.com/gsi/iframe"]
+    {
+        display: none !important;
+    }
+}
+
 @-moz-document regexp("https?://(www)?yandex\.(com|ru)/search/.*")
 {
     #search-result-aside,
@@ -67,8 +75,8 @@
     a[href^="/sponsors"],
     a[href^="/topics"],
     a[href^="/trending"],
-    a[href^="https://github.com/codespaces"], /* No code reviews on GitHub? How come is this link in production? */
-    button[data-testid="copilot-popover-button"], /* Fuck you, GitHub! I'm sick this shit. */
+    a[href^="https://github.com/codespaces"], /* Absolute cringe... */
+    button[data-testid="copilot-popover-button"],
     details[id^="funding-links-modal"],
     footer {
         display: none !important;
@@ -168,7 +176,7 @@
     }
 }
 
-@-moz-document regexp("https?://habr\.com/(ru|en)/(article|company/.*/news|blog|post)/.*")
+@-moz-document regexp("https?://habr\.com/(ru|en)/(article|company/.*/news|companies|blog|post)/.*")
 {
     .Vue-Toastification__container,
     .tm-article-presenter__footer,