From 9e0a89e55dc3a463846abf501e9fa949af8a3a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Wed, 12 Apr 2023 21:13:33 +0200
Subject: [PATCH] feat(browsers): move firefox addons into own file

---
 home/browsers/firefox.nix         | 18 ++----------------
 home/browsers/firefoxAddons.nix   | 19 +++++++++++++++++++
 home/browsers/mullvad-browser.nix | 18 ++----------------
 3 files changed, 23 insertions(+), 32 deletions(-)
 create mode 100644 home/browsers/firefoxAddons.nix

diff --git a/home/browsers/firefox.nix b/home/browsers/firefox.nix
index 628471c..a2ee096 100644
--- a/home/browsers/firefox.nix
+++ b/home/browsers/firefox.nix
@@ -2,7 +2,8 @@
 
 with lib;
 let
-  inherit (pkgs.nur.repos.rycee) firefox-addons;
+  firefox-addons = pkgs.nur.repos.rycee.firefox-addons
+    // (import ./firefoxAddons.nix { inherit pkgs lib; });
 
   prefer-dark-theme =
     config.gtk.gtk3.extraConfig.gtk-application-prefer-dark-theme;
@@ -94,21 +95,6 @@ let
     "extensions.pocket.enabled" = false;
   };
 
-  zotero-connector = firefox-addons.buildFirefoxXpiAddon rec {
-    pname = "zotero-connector";
-    version = "5.0.107";
-    addonId = "zotero@chnm.gmu.edu";
-    url =
-      "https://download.zotero.org/connector/firefox/release/Zotero_Connector-${version}.xpi";
-    sha256 = "sha256-RuAhWGvUhkog8SxzKhRwQQwzTQLzBKlHjSsFj9e25e4=";
-    meta = with lib; {
-      homepage = "https://www.zotero.org";
-      description = "Save references to Zotero from your web browser";
-      license = licenses.agpl3;
-      platforms = platforms.all;
-    };
-  };
-
   commonExtensions = with firefox-addons; [
     ublock-origin
     bitwarden
diff --git a/home/browsers/firefoxAddons.nix b/home/browsers/firefoxAddons.nix
new file mode 100644
index 0000000..6130e3d
--- /dev/null
+++ b/home/browsers/firefoxAddons.nix
@@ -0,0 +1,19 @@
+{ pkgs, lib, ... }:
+
+let inherit (pkgs.nur.repos.rycee) firefox-addons;
+in {
+  zotero-connector = firefox-addons.buildFirefoxXpiAddon rec {
+    pname = "zotero-connector";
+    version = "5.0.107";
+    addonId = "zotero@chnm.gmu.edu";
+    url =
+      "https://download.zotero.org/connector/firefox/release/Zotero_Connector-${version}.xpi";
+    sha256 = "sha256-RuAhWGvUhkog8SxzKhRwQQwzTQLzBKlHjSsFj9e25e4=";
+    meta = with lib; {
+      homepage = "https://www.zotero.org";
+      description = "Save references to Zotero from your web browser";
+      license = licenses.agpl3;
+      platforms = platforms.all;
+    };
+  };
+}
diff --git a/home/browsers/mullvad-browser.nix b/home/browsers/mullvad-browser.nix
index aafe7a9..f4c66cb 100644
--- a/home/browsers/mullvad-browser.nix
+++ b/home/browsers/mullvad-browser.nix
@@ -1,7 +1,8 @@
 { config, nixosConfig, pkgs, lib, ... }:
 
 let
-  inherit (pkgs.nur.repos.rycee) firefox-addons;
+  firefox-addons = pkgs.nur.repos.rycee.firefox-addons
+    // (import ./firefoxAddons.nix { inherit pkgs lib; });
 
   commonSettings = {
     # Disable private browsing mode and restoring sessions
@@ -22,21 +23,6 @@ let
     "dom.push.serverURL" = "wss://push.services.mozilla.com/";
   };
 
-  zotero-connector = firefox-addons.buildFirefoxXpiAddon rec {
-    pname = "zotero-connector";
-    version = "5.0.107";
-    addonId = "zotero@chnm.gmu.edu";
-    url =
-      "https://download.zotero.org/connector/firefox/release/Zotero_Connector-${version}.xpi";
-    sha256 = "sha256-RuAhWGvUhkog8SxzKhRwQQwzTQLzBKlHjSsFj9e25e4=";
-    meta = with lib; {
-      homepage = "https://www.zotero.org";
-      description = "Save references to Zotero from your web browser";
-      license = licenses.agpl3;
-      platforms = platforms.all;
-    };
-  };
-
   commonExtensions = with firefox-addons; [
     bitwarden
     vimium