From f5831262b37d84b1b7041df40fe075874edbd33e Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Thu, 14 Nov 2024 14:41:18 -0500
Subject: [PATCH] Touchups to browser privacy settings

---
 .../home/programs/gui/librewolf/default.nix   | 52 +++++++++++--------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix
index 09174f5..283d576 100644
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/librewolf/default.nix
@@ -79,33 +79,41 @@ in {
       };
     };
     commonSettings = {
-      "font.name.serif.x-western" = "${config.look.fonts.main}";
-      "font.name.sans-serif.x-western" = "${config.look.fonts.main}";
-      "font.name.monospace.x-western" = "${config.look.fonts.nerd}";
       "general.autoScroll" = true;
+
+      "font.name.serif.x-western" = config.look.fonts.main;
+      "font.name.sans-serif.x-western" = config.look.fonts.main;
+      "font.name.monospace.x-western" = config.look.fonts.nerd;
+
       "browser.compactmode.show" = true;
       "browser.uidensity" = 1;
       "browser.startup.page" = 3;
-      "extensions.pocket.enabled" = false;
-      "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-      "privacy.userContext.newTabContainerOnLeftClick.enabled" = true;
-      "privacy.clearOnShutdown.history" = false;
-      "privacy.clearOnShutdown.cookies" = false;
-      "privacy.clearOnShutdown_v2.cookiesAndStorage" = false;
       "browser.toolbars.bookmarks.visibility" = "never";
-      "media.hardware-video-decoding.force-enabled" = true;
-      "svg.context-properties.content.enabled" = true;
-      "toolkit.tabbox.switchByScrolling" = true;
-      "device.sensors.motion.enabled" = false;
-      "extensions.autoDisableScopes" = 0;
-      "gnomeTheme.hideSingleTab" = true;
       "browser.contentblocking.category" = "strict";
-      "urlclassifier.trackingSkipURLs" = "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com";
-      "urlclassifier.features.socialtracking.skipURLs" = "*.instagram.com, *.twitter.com, *.twimg.com";
-      "network.cookie.sameSite.noneRequiresSecure" = true;
       "browser.helperApps.deleteTempFileOnExit" = true;
+
+      "extensions.pocket.enabled" = false;
+      "extensions.autoDisableScopes" = 0;
+
+      "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+      "toolkit.tabbox.switchByScrolling" = true;
+
+      "privacy.donottrackheader.enabled" = true;
+      "privacy.userContext.newTabContainerOnLeftClick.enabled" = true;
       "privacy.globalprivacycontrol.enabled" = true;
       "privacy.globalprivacycontrol.functionality.enabled" = true;
+      "privacy.clearOnShutdown.cookies" = false;
+      "privacy.clearOnShutdown_v2.cookiesAndStorage" = false;
+      "privacy.clearOnShutdown_v2.historyFormDataAndDownloads" = true;
+
+      "urlclassifier.trackingSkipURLs" = "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com";
+      "urlclassifier.features.socialtracking.skipURLs" = "*.instagram.com, *.twitter.com, *.twimg.com";
+
+      "media.hardware-video-decoding.force-enabled" = true;
+      "network.cookie.sameSite.noneRequiresSecure" = true;
+      "svg.context-properties.content.enabled" = true;
+      "device.sensors.motion.enabled" = false;
+      "gnomeTheme.hideSingleTab" = true;
       "webgl.disabled" = false;
     };
   in {
@@ -150,9 +158,9 @@ in {
     ".librewolf".source = config.lib.file.mkOutOfStoreSymlink "/home/jimbo/.mozilla/firefox";
     
     # Gnome theme
-    ".mozilla/firefox/Misc/chrome".source = "${fetchTarball {
-      url = "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/refs/tags/v129.zip";
-      sha256 = "14x0vp66i8b14q6c9n75sa88fcwy9jd9lik8sjnab2rnwlskvq9h";
-    }}";
+    ".mozilla/firefox/Misc/chrome".source = fetchTarball {
+      url = "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/refs/tags/v132.zip";
+      sha256 = "095sv1ann2v7q5bfy65i118ylhp2vkpbgyf6fz84nd9yrx14rzwm";
+    };
   };
 }