From c33121e3480823f63bc6fae461de5cbcde227739 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Fri, 7 Nov 2025 12:06:11 -0600
Subject: [PATCH] refactor: moved firefox configs to the common modules
 packages folder

---
 .../leyla/packages/firefox/firefox.nix        | 36 ++-----------------
 modules/common-modules/pkgs/default.nix       | 11 +++++-
 .../pkgs/firefox-extensions/default.nix       | 14 ++++++++
 .../dizionario-italiano.nix                   | 18 ++++++++++
 .../italiano-it-language-pack.nix             | 18 ++++++++++
 5 files changed, 63 insertions(+), 34 deletions(-)
 create mode 100644 modules/common-modules/pkgs/firefox-extensions/default.nix
 create mode 100644 modules/common-modules/pkgs/firefox-extensions/dizionario-italiano.nix
 create mode 100644 modules/common-modules/pkgs/firefox-extensions/italiano-it-language-pack.nix

diff --git a/configurations/home-manager/leyla/packages/firefox/firefox.nix b/configurations/home-manager/leyla/packages/firefox/firefox.nix
index f1097a1..fecb038 100644
--- a/configurations/home-manager/leyla/packages/firefox/firefox.nix
+++ b/configurations/home-manager/leyla/packages/firefox/firefox.nix
@@ -49,9 +49,7 @@
         };
       };
 
-      extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; let
-        inherit (inputs.firefox-addons.lib.${pkgs.stdenv.hostPlatform.system}) buildFirefoxXpiAddon;
-      in [
+      extensions.packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
         bitwarden
         terms-of-service-didnt-read
         multi-account-containers
@@ -75,36 +73,8 @@
 
         tab-session-manager
 
-        (
-          buildFirefoxXpiAddon rec {
-            pname = "italiano-it-language-pack";
-            version = "132.0.20241110.231641";
-            addonId = "langpack-it@firefox.mozilla.org";
-            url = "https://addons.mozilla.org/firefox/downloads/file/4392453/italiano_it_language_pack-${version}.xpi";
-            sha256 = "2b4764045daa62b00de8773fdfb03b5bbc1cd62c42f8fa27ef70c412d549dbe6";
-            meta = with lib; {
-              description = "Firefox Language Pack for Italiano (it) – Italian";
-              license = licenses.mpl20;
-              mozPermissions = [];
-              platforms = platforms.all;
-            };
-          }
-        )
-        (
-          buildFirefoxXpiAddon rec {
-            pname = "dizionario-italiano";
-            version = "5.1";
-            addonId = "it-IT@dictionaries.addons.mozilla.org";
-            url = "https://addons.mozilla.org/firefox/downloads/file/1163874/dizionario_italiano-${version}.xpi";
-            sha256 = "ae75847ce65e7744ba44d5f7d98a18b81f61770a0fdfc6d06bae8b7239535ee0";
-            meta = with lib; {
-              description = "Add support for Italian to spellchecking";
-              license = licenses.gpl3;
-              mozPermissions = [];
-              platforms = platforms.all;
-            };
-          }
-        )
+        pkgs.firefox-extensions.italiano-it-language-pack
+        pkgs.firefox-extensions.dizionario-italiano
       ];
 
       settings = {
diff --git a/modules/common-modules/pkgs/default.nix b/modules/common-modules/pkgs/default.nix
index c97f97c..612dd08 100644
--- a/modules/common-modules/pkgs/default.nix
+++ b/modules/common-modules/pkgs/default.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: {
   imports = [
     ./python
   ];
@@ -25,6 +29,11 @@
     (final: prev: {
       codium-extensions = pkgs.callPackage ./codium-extensions {};
     })
+    (final: prev: {
+      firefox-extensions = pkgs.callPackage ./firefox-extensions {
+        inherit inputs;
+      };
+    })
     (final: prev: {
       mapillary-uploader = pkgs.callPackage ./mapillary-uploader.nix {};
     })
diff --git a/modules/common-modules/pkgs/firefox-extensions/default.nix b/modules/common-modules/pkgs/firefox-extensions/default.nix
new file mode 100644
index 0000000..5e3e70c
--- /dev/null
+++ b/modules/common-modules/pkgs/firefox-extensions/default.nix
@@ -0,0 +1,14 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: let
+  inherit (inputs.firefox-addons.lib.${pkgs.stdenv.hostPlatform.system}) buildFirefoxXpiAddon;
+in {
+  italiano-it-language-pack = pkgs.callPackage ./italiano-it-language-pack.nix {
+    inherit buildFirefoxXpiAddon;
+  };
+  dizionario-italiano = pkgs.callPackage ./dizionario-italiano.nix {
+    inherit buildFirefoxXpiAddon;
+  };
+}
diff --git a/modules/common-modules/pkgs/firefox-extensions/dizionario-italiano.nix b/modules/common-modules/pkgs/firefox-extensions/dizionario-italiano.nix
new file mode 100644
index 0000000..6fb793c
--- /dev/null
+++ b/modules/common-modules/pkgs/firefox-extensions/dizionario-italiano.nix
@@ -0,0 +1,18 @@
+{
+  lib,
+  buildFirefoxXpiAddon,
+  ...
+}:
+buildFirefoxXpiAddon rec {
+  pname = "dizionario-italiano";
+  version = "5.1";
+  addonId = "it-IT@dictionaries.addons.mozilla.org";
+  url = "https://addons.mozilla.org/firefox/downloads/file/1163874/dizionario_italiano-${version}.xpi";
+  sha256 = "ae75847ce65e7744ba44d5f7d98a18b81f61770a0fdfc6d06bae8b7239535ee0";
+  meta = with lib; {
+    description = "Add support for Italian to spellchecking";
+    license = licenses.gpl3;
+    mozPermissions = [];
+    platforms = platforms.all;
+  };
+}
diff --git a/modules/common-modules/pkgs/firefox-extensions/italiano-it-language-pack.nix b/modules/common-modules/pkgs/firefox-extensions/italiano-it-language-pack.nix
new file mode 100644
index 0000000..765368c
--- /dev/null
+++ b/modules/common-modules/pkgs/firefox-extensions/italiano-it-language-pack.nix
@@ -0,0 +1,18 @@
+{
+  lib,
+  buildFirefoxXpiAddon,
+  ...
+}:
+buildFirefoxXpiAddon rec {
+  pname = "italiano-it-language-pack";
+  version = "132.0.20241110.231641";
+  addonId = "langpack-it@firefox.mozilla.org";
+  url = "https://addons.mozilla.org/firefox/downloads/file/4392453/italiano_it_language_pack-${version}.xpi";
+  sha256 = "2b4764045daa62b00de8773fdfb03b5bbc1cd62c42f8fa27ef70c412d549dbe6";
+  meta = with lib; {
+    description = "Firefox Language Pack for Italiano (it) – Italian";
+    license = licenses.mpl20;
+    mozPermissions = [];
+    platforms = platforms.all;
+  };
+}