From b36acc10a5c93dfcf2cc26fa7d2a052205fdffdb Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Wed, 20 Dec 2023 11:40:46 +0000
Subject: [PATCH] Re-enable firefox, remove a couple of addons I'm not using
 anymore

---
 flake.nix                 |  1 +
 home/hyprland/config.nix  |  1 -
 home/hyprland/default.nix | 22 +++++++++++-----------
 system/chromium.nix       |  5 +----
 system/desktop.nix        |  2 +-
 system/firefox.nix        | 12 ------------
 6 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/flake.nix b/flake.nix
index eb929249..3aab5fbb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,7 @@
           ./home/alacritty.nix
           ./home/default.nix
           ./home/emacs.nix
+          ./home/firefox.nix
           ./home/pass.nix
         ];
         stateVersion = "23.05";
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index a4ab3e1a..c2ddb4a4 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -186,7 +186,6 @@ in ''
   bind = SUPER, W, moveworkspacetomonitor, name:web current
   bind = SUPER, W, workspace, name:web
   bind = SUPER SHIFT, W, movetoworkspace, name:web
-  bind = SUPER ALT, W, exec, [workspace name:web] nyxt
   windowrule = workspace name:web, (firefox|chromium-browser)
 
   bind = SUPER, B, moveworkspacetomonitor, name:btm current
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 9539454b..e6f344ed 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -39,17 +39,17 @@
         "image/png" = [ "swayimg.desktop" ];
         "video/mp4" = [ "mpv.desktop" ];
         "text/csv" = [ "calc.desktop" ];
-        "text/html" = [ "nyxt.desktop" ];
-        "x-scheme-handler/http" = [ "nyxt.desktop" ];
-        "x-scheme-handler/https" = [ "nyxt.desktop" ];
-        "x-scheme-handler/about" = [ "nyxt.desktop" ];
-        "x-scheme-handler/chrome" = [ "nyxt.desktop" ];
-        "application/x-extension-htm" = [ "nyxt.desktop" ];
-        "application/x-extension-html" = [ "nyxt.desktop" ];
-        "application/x-extension-shtml" = [ "nyxt.desktop" ];
-        "application/xhtml+xml" = [ "nyxt.desktop" ];
-        "application/x-extension-xhtml" = [ "nyxt.desktop" ];
-        "application/x-extension-xht" = [ "nyxt.desktop" ];
+        "text/html" = [ "firefox.desktop" ];
+        "x-scheme-handler/http" = [ "firefox.desktop" ];
+        "x-scheme-handler/https" = [ "firefox.desktop" ];
+        "x-scheme-handler/about" = [ "firefox.desktop" ];
+        "x-scheme-handler/chrome" = [ "firefox.desktop" ];
+        "application/x-extension-htm" = [ "firefox.desktop" ];
+        "application/x-extension-html" = [ "firefox.desktop" ];
+        "application/x-extension-shtml" = [ "firefox.desktop" ];
+        "application/xhtml+xml" = [ "firefox.desktop" ];
+        "application/x-extension-xhtml" = [ "firefox.desktop" ];
+        "application/x-extension-xht" = [ "firefox.desktop" ];
       };
       associations.added = defaultApplications;
     };
diff --git a/system/chromium.nix b/system/chromium.nix
index b0f31a7c..226b8d7a 100644
--- a/system/chromium.nix
+++ b/system/chromium.nix
@@ -1,7 +1,4 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [ chromium ];
+{ pkgs, ... }: {
   programs.chromium = rec {
     enable = true;
     defaultSearchProviderEnabled = true;
diff --git a/system/desktop.nix b/system/desktop.nix
index a110e193..4cf97d8b 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -1,7 +1,7 @@
 { config, pkgs, user, ... }:
 
 {
-  imports = [ ./default.nix ./chromium.nix ];
+  imports = [ ./default.nix ./firefox.nix ./chromium.nix ];
   environment.systemPackages = with pkgs; [
     dex
     mesa
diff --git a/system/firefox.nix b/system/firefox.nix
index 6b5d9ad7..c0ad608f 100644
--- a/system/firefox.nix
+++ b/system/firefox.nix
@@ -43,18 +43,6 @@
           install_url =
             "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
         };
-        "7esoorv3@alefvanoon.anonaddy.me" = {
-          # LibRedirect
-          installation_mode = "force_installed";
-          install_url =
-            "https://addons.mozilla.org/firefox/downloads/latest/libredirect/latest.xpi";
-        };
-        "jid1-KKzOGWgsW3Ao4Q@jetpack" = {
-          # I don't care about cookies
-          installation_mode = "force_installed";
-          install_url =
-            "https://addons.mozilla.org/firefox/downloads/latest/i-dont-care-about-cookies/latest.xpi";
-        };
         "floccus@handmadeideas.org" = {
           # floccus bookmarks sync
           installation_mode = "force_installed";