diff --git a/modules/firefox-nixos.nix b/modules/firefox-nixos.nix
new file mode 100644
index 0000000..f8adfff
--- /dev/null
+++ b/modules/firefox-nixos.nix
@@ -0,0 +1,25 @@
+{ ... }:
+let
+in
+{
+  programs.firefox = {
+    ExtensionSettings = {
+      "uBlock0@raymondhill.net" = {
+        install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+        installation_mode = "force_installed";
+      };
+      "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
+        install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
+        installation_mode = "force_installed";
+      };
+      "jid1-MnnxcxisBPnSXQ@jetpack" = {
+        install_url = "https://addons.mozilla.org/firefox/downloads/latest/privacy-badger17/latest.xpi";
+        installation_mode = "force_installed";
+      };
+      "extension@tabliss.io" = {
+        install_url = "https://addons.mozilla.org/firefox/downloads/file/3940751/tabliss-2.6.0.xpi";
+        installation_mode = "force_installed";
+      };
+    };
+  };
+}
diff --git a/modules/fonts.nix b/modules/fonts.nix
index d798d20..ce07a82 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -1,4 +1,15 @@
 { pkgs, ... }:
+let
+  # Fetch the JSON file
+  fontsJson = builtins.fetchurl {
+    url = "https://raw.githubusercontent.com/NixOS/nixpkgs/nixos-unstable/pkgs/data/fonts/nerd-fonts/manifests/fonts.json";
+    sha256 = "1kdmk4ayckixxckxbik9jg4fdqqgm7s5x1lvzd95v1g09bhn33wg";
+  };
+
+  # Parse the JSON and extract package names
+  fonts = builtins.fromJSON fontsJson;
+  packageNames = map (font: font.package) fonts;
+in
 {
   fonts.packages =
     with pkgs;
@@ -7,5 +18,5 @@
       comic-mono
       nerdfonts
     ]
-    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerdfonts);
+    ++ packageNames;
 }