From b6911bc04519afb104192ded99896d453f998b58 Mon Sep 17 00:00:00 2001
From: biscuit <biscuit@nixos.com>
Date: Wed, 11 Jun 2025 06:54:24 -0500
Subject: [PATCH] nix: added firefox

---
 modules/desktop/app.nix  |  3 ---
 modules/misc.nix         |  1 +
 pkgs/firefox/default.nix | 55 ++++++++++++++++++++--------------------
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/modules/desktop/app.nix b/modules/desktop/app.nix
index 319c9ef..65f2dbe 100644
--- a/modules/desktop/app.nix
+++ b/modules/desktop/app.nix
@@ -2,7 +2,4 @@
   info = import ../../config.nix;
 in {
   home.packages = info.linux-apps.my-apps pkgs;
-  import = [
-    ../../pkgs/firefox/default.nix
-  ];
 }
diff --git a/modules/misc.nix b/modules/misc.nix
index bb72d01..0e44438 100644
--- a/modules/misc.nix
+++ b/modules/misc.nix
@@ -5,6 +5,7 @@
 }: {
   imports =
     [
+      ../../pkgs/firefox/default.nix
     ]
     ++ lib.optionals (linux-apps.gamingDesktop == true) [
       ../../pkgs/steam/default.nix
diff --git a/pkgs/firefox/default.nix b/pkgs/firefox/default.nix
index 079c4e8..6455fc0 100644
--- a/pkgs/firefox/default.nix
+++ b/pkgs/firefox/default.nix
@@ -61,7 +61,7 @@ in {
           "tridactyl.vim@cmcaine.co.uk" = {
             install_url = "https://addons.mozilla.org/firefox/downloads/file/4405615/tridactyl_vim-1.24.2.xpi";
             installation_mode = "force_installed";
-          }
+          };
           # Privacy Badger:
           # "jid1-MnnxcxisBPnSXQ@jetpack" = {
           #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
@@ -71,36 +71,35 @@ in {
           # "{d634138d-c276-4fc8-924b-40a0ea21d284}" = {
           #   install_url = "https://addons.mozilla.org/firefox/downloads/latest/1password-x-password-manager/latest.xpi";
           #   installation_mode = "force_installed";
-          };
         };
+      };
 
-        /*
-        ---- PREFERENCES ----
-        */
-        # Check about:config for options.
-        Preferences = {
-          "browser.contentblocking.category" = {
-            Value = "strict";
-            Status = "locked";
-          };
-          "extensions.pocket.enabled" = lock-false;
-          "extensions.screenshots.disabled" = lock-true;
-          "browser.topsites.contile.enabled" = lock-false;
-          "browser.formfill.enable" = lock-false;
-          "browser.search.suggest.enabled" = lock-false;
-          "browser.search.suggest.enabled.private" = lock-false;
-          "browser.urlbar.suggest.searches" = lock-false;
-          "browser.urlbar.showSearchSuggestionsFirst" = lock-false;
-          "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false;
-          "browser.newtabpage.activity-stream.feeds.snippets" = lock-false;
-          "browser.newtabpage.activity-stream.section.highlights.includePocket" = lock-false;
-          "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = lock-false;
-          "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = lock-false;
-          "browser.newtabpage.activity-stream.section.highlights.includeVisited" = lock-false;
-          "browser.newtabpage.activity-stream.showSponsored" = lock-false;
-          "browser.newtabpage.activity-stream.system.showSponsored" = lock-false;
-          "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false;
+      /*
+      ---- PREFERENCES ----
+      */
+      # Check about:config for options.
+      Preferences = {
+        "browser.contentblocking.category" = {
+          Value = "strict";
+          Status = "locked";
         };
+        "extensions.pocket.enabled" = lock-false;
+        "extensions.screenshots.disabled" = lock-true;
+        "browser.topsites.contile.enabled" = lock-false;
+        "browser.formfill.enable" = lock-false;
+        "browser.search.suggest.enabled" = lock-false;
+        "browser.search.suggest.enabled.private" = lock-false;
+        "browser.urlbar.suggest.searches" = lock-false;
+        "browser.urlbar.showSearchSuggestionsFirst" = lock-false;
+        "browser.newtabpage.activity-stream.feeds.section.topstories" = lock-false;
+        "browser.newtabpage.activity-stream.feeds.snippets" = lock-false;
+        "browser.newtabpage.activity-stream.section.highlights.includePocket" = lock-false;
+        "browser.newtabpage.activity-stream.section.highlights.includeBookmarks" = lock-false;
+        "browser.newtabpage.activity-stream.section.highlights.includeDownloads" = lock-false;
+        "browser.newtabpage.activity-stream.section.highlights.includeVisited" = lock-false;
+        "browser.newtabpage.activity-stream.showSponsored" = lock-false;
+        "browser.newtabpage.activity-stream.system.showSponsored" = lock-false;
+        "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false;
       };
     };
   };