From 6d3bb3f935fc1dcd8026bcb5b005d2ba4f7b5c68 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Sat, 8 Jul 2023 19:15:47 +0000
Subject: [PATCH] Switch to firefox-bin, remove extraneous firefox.nix

---
 flake.lock        | 26 +++++++++++++-------------
 home/firefox.nix  | 16 ----------------
 sets/packages.nix |  2 +-
 3 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 100644 home/firefox.nix

diff --git a/flake.lock b/flake.lock
index 94b92b5..8560ec1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1686838567,
-        "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=",
+        "lastModified": 1688798314,
+        "narHash": "sha256-MFG5rx7L756rtrPHsL662m64AZ4sKqUcApaiYgSKfNM=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89",
+        "rev": "47dca15d86fdd2eabcf434d7cc0b5baa8d1a463c",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1688594934,
-        "narHash": "sha256-3dUo20PsmUd57jVZRx5vgKyIN1tv+v/JQweZsve5q/A=",
+        "lastModified": 1688764204,
+        "narHash": "sha256-FsvK+tIvelCI0tWwlMDKfiyb7P/KfxpGbXMrdCKiT8s=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e11142026e2cef35ea52c9205703823df225c947",
+        "rev": "d8bb6c681cf86265fdcf3cc3119f757bbb085835",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1688590700,
-        "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=",
+        "lastModified": 1688679045,
+        "narHash": "sha256-t3xGEfYIwhaLTPU8FLtN/pLPytNeDwbLI6a7XFFBlGo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b",
+        "rev": "3c7487575d9445185249a159046cc02ff364bff8",
         "type": "github"
       },
       "original": {
@@ -70,11 +70,11 @@
     },
     "private": {
       "locked": {
-        "lastModified": 1656526244,
-        "narHash": "sha256-FLoNh/rvQhkwMSzKj0lzkX3l+TY3Zp5sJZpwaxsLY7E=",
+        "lastModified": 1688700418,
+        "narHash": "sha256-IoC3cAf11rJ9cwtM/y2gWXnCUwIIP4rcQRsMtdr7d/c=",
         "ref": "unified",
-        "rev": "214732b6071afb2a9a1c2510528ce4f35c1b299e",
-        "revCount": 30,
+        "rev": "a347e1d1fe0190b56c0268396fb719652bf4e839",
+        "revCount": 31,
         "type": "git",
         "url": "ssh://git@github.com/artemist/nixos-config-private"
       },
diff --git a/home/firefox.nix b/home/firefox.nix
deleted file mode 100644
index 648658c..0000000
--- a/home/firefox.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.firefox = {
-    enable = true;
-    package = pkgs.firefox-wayland;
-    profiles.default.settings = {
-      "app.shield.outputstudies.enabled" = false;
-      "privacy.firstparty.isolate" = true;
-      "devtools.theme" = "light";
-      "browser.urlbar.switchTabs.adoptIntoActiveWindow" = true;
-      "browser.newtabpage.activity-stream.feeds.topsites" = false;
-      "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
-    };
-  };
-}
diff --git a/sets/packages.nix b/sets/packages.nix
index 0129f86..edbff7b 100644
--- a/sets/packages.nix
+++ b/sets/packages.nix
@@ -102,7 +102,7 @@
     libreoffice-fresh
 
     # Web
-    firefox-wayland
+    firefox-bin
     google-chrome
 
     # Gnome configuration