From 586161921825f82d818a97d2aa458bb80fe64ec8 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sat, 20 May 2023 12:11:35 -0600
Subject: [PATCH] gui: add firefox conf, merge common prefs

---
 gui/default.nix           | 140 ++++++++++++++++++++++++--------------
 hosts/stan/default.nix    |   1 -
 hosts/weather/default.nix |   1 -
 3 files changed, 89 insertions(+), 53 deletions(-)

diff --git a/gui/default.nix b/gui/default.nix
index 2d334e5..ea45e84 100644
--- a/gui/default.nix
+++ b/gui/default.nix
@@ -23,6 +23,91 @@ let
     startAt = "*:0/5";
     path = [ promnesia hpi ];
   }];
+  commonConfigs = {
+    fonts.fonts = with pkgs; [ go-font (callPackage ../pkgs/kurinto.nix { }) ];
+    sound.enable = true;
+    environment.systemPackages = with pkgs; [
+      bc
+      black
+      brave
+      drawterm
+      go-font
+      hpi
+      pcsctools
+      promnesia
+      rage
+      rpr
+      vlc
+      zeal
+
+      (callPackage ../pkgs/tailscale-systray.nix { })
+      (callPackage ../pkgs/govulncheck.nix { })
+      (callPackage ../configs/helix.nix { })
+    ];
+
+    systemd.user.services =
+      (lib.listToAttrs (builtins.map xinlib.jobToUserService jobs))
+      // promnesiaService;
+
+    programs = {
+      firefox = {
+        enable = true;
+        preferences = {
+          # TODO: confirm no issues
+          "dom.allow_cut_copy" = false;
+          "dom.event.clipboardevents.enabled" = false;
+          "media.peerconnection.enabled" = false;
+
+          "beacon.enabled" = false;
+          "browser.aboutConfig.showWarning" = false;
+          "browser.contentblocking.category" = "strict";
+          "browser.newtabpage.activity-stream.feeds.recommendationprovider" =
+            false;
+          "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
+          "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" =
+            false;
+          "browser.newtabpage.activity-stream.section.highlights.includeDownloads" =
+            false;
+          "browser.newtabpage.activity-stream.section.highlights.includePocket" =
+            false;
+          "browser.newtabpage.activity-stream.section.highlights.includeVisited" =
+            false;
+          "browser.newtabpage.activity-stream.showSearch" = false;
+          "browser.newtabpage.activity-stream.showSponsored" = false;
+          "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+          "browser.newtabpage.activity-stream.telemetry" = false;
+          "browser.newtabpage.activity-stream.telemetry.structuredIngestion.endpoint" =
+            "http://127.0.0.1/null";
+          "browser.newtabpage.enabled" = false;
+          "browser.newtabpage.pinned" = false;
+          "browser.search.suggest.enabled" = false;
+          "browser.search.update" = false;
+          "browser.topsites.contile.enabled" = false;
+          "browser.urlbar.suggest.quicksuggest.nonsponsored" = false;
+          "browser.urlbar.suggest.quicksuggest.sponsored" = false;
+          "browser.urlbar.suggest.searches" = false;
+          "browser.urlbar.trimURLs" = false;
+          "datareporting.healthreport.uploadEnabled" = false;
+          "devtools.cache.disabled" = true;
+          "extensions.pocket.enabled" = false;
+          "geo.enabled" = false;
+          "geo.provider.network.url" = "";
+          "geo.provider.use_geoclue" = false;
+          "network.dns.disablePrefetch" = true;
+          "network.http.speculative-parallel-limit" = 0;
+          "network.IDN_show_punycode" = true;
+          "network.predictor.enabled" = false;
+          "network.prefetch-next" = false;
+          "privacy.resistFingerprinting" = true;
+          "security.OCSP.enabled" = false;
+          "services.sync.prefs.sync-seen.browser.newtabpage.activity-stream.section.highlights.includePocket" =
+            false;
+        };
+      };
+    };
+    services = { pcscd.enable = true; };
+    security.rtkit.enable = true;
+  };
 in with lib; {
   imports = [ ./gnome.nix ./kde.nix ./xfce.nix ./arcan.nix ];
 
@@ -46,61 +131,14 @@ in with lib; {
   };
 
   config = mkMerge [
-    (mkIf config.arcan.enable {
-      sound.enable = true;
-      services = { xserver.enable = false; };
-      environment.systemPackages = with pkgs; [
-        brave
-        firefox
-        drawterm
-        go-font
-        vlc
-        pcsctools
-      ];
-    })
+    (mkIf config.arcan.enable { services = { xserver.enable = false; }; }
+      // commonConfigs)
     (mkIf (config.kde.enable || config.gnome.enable || config.xfce.enable) {
-
-      services = {
-        xserver.enable = true;
-        pcscd.enable = true;
-      };
-
-      fonts.fonts = with pkgs; [
-        go-font
-        (callPackage ../pkgs/kurinto.nix { })
-      ];
-
+      services = { xserver.enable = true; };
       # TODO: TEMP FIX
       systemd.services.NetworkManager-wait-online.serviceConfig.ExecStart =
         lib.mkForce [ "" "${pkgs.networkmanager}/bin/nm-online -q" ];
-
-      sound.enable = true;
-      security.rtkit.enable = true;
-
-      systemd.user.services =
-        (lib.listToAttrs (builtins.map xinlib.jobToUserService jobs))
-        // promnesiaService;
-
-      environment.systemPackages = with pkgs; [
-        bc
-        black
-        brave
-        drawterm
-        firefox
-        hpi
-        pcsctools
-        promnesia
-        rage
-        rpr
-        vlc
-        zeal
-
-        (callPackage ../pkgs/tailscale-systray.nix { })
-        (callPackage ../pkgs/govulncheck.nix { })
-        (callPackage ../configs/helix.nix { })
-      ];
-
-    })
+    } // commonConfigs)
     (mkIf config.pipewire.enable {
       services.pipewire = {
         enable = true;
diff --git a/hosts/stan/default.nix b/hosts/stan/default.nix
index a19837b..c68bc88 100644
--- a/hosts/stan/default.nix
+++ b/hosts/stan/default.nix
@@ -158,7 +158,6 @@ in {
     barrier
     bitwarden
     brave
-    firefox
     fzf
     google-chrome-dev
     ispell
diff --git a/hosts/weather/default.nix b/hosts/weather/default.nix
index 48cd25f..3a071e1 100644
--- a/hosts/weather/default.nix
+++ b/hosts/weather/default.nix
@@ -187,7 +187,6 @@ in {
 
   environment.systemPackages = with pkgs; [
     qutebrowser
-    firefox
     dtc
     rofi
     polybar