From 44d708329a823ea32ddd90e50ac30caf01beb3f3 Mon Sep 17 00:00:00 2001
From: Lucy von Overheidt <git@lucy.giving>
Date: Tue, 9 Sep 2025 22:57:24 +0200
Subject: [PATCH] before deadnix

---
 flake.nix                 | 41 +++++++++++++++++++++------------------
 modules/firefox-nixos.nix |  2 +-
 modules/fonts.nix         |  6 +++---
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index c726f5b..f5db403 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,23 +35,24 @@
       url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
   };
 
   outputs =
-    inputs@{ self
-    , nixpkgs
-    , c3d2-user-module
-    , home-manager
-    , niri
-    , nixos-hardware
-    , treefmt-nix
-    , determinate
-    , nix-index-db
-    , quickshell
-    , stylix
-    , comin
-    , firefox-addons
-    ,
+    inputs@{
+      self,
+      nixpkgs,
+      c3d2-user-module,
+      home-manager,
+      niri,
+      nixos-hardware,
+      treefmt-nix,
+      determinate,
+      nix-index-db,
+      quickshell,
+      stylix,
+      comin,
+      firefox-addons,
     }:
     let
       system = "x86_64-linux";
@@ -138,11 +139,12 @@
             home-manager.backupFileExtension = "backup";
             home-manager.extraSpecialArgs = { inherit inputs; };
             home-manager.users.lucy =
-              { config
-              , pkgs
-              , lib
-              , inputs
-              , ...
+              {
+                config,
+                pkgs,
+                lib,
+                inputs,
+                ...
               }:
               {
                 imports = [
@@ -179,6 +181,7 @@
           ./modules/comin.nix
           stylix.nixosModules.stylix
           ./modules/stylix.nix
+          ./modules/firefox-nixos.nix
         ];
       };
 
diff --git a/modules/firefox-nixos.nix b/modules/firefox-nixos.nix
index f8adfff..7338d72 100644
--- a/modules/firefox-nixos.nix
+++ b/modules/firefox-nixos.nix
@@ -3,7 +3,7 @@ let
 in
 {
   programs.firefox = {
-    ExtensionSettings = {
+    policies.ExtensionSettings = {
       "uBlock0@raymondhill.net" = {
         install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
         installation_mode = "force_installed";
diff --git a/modules/fonts.nix b/modules/fonts.nix
index ce07a82..768afa2 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -1,13 +1,13 @@
 { pkgs, ... }:
 let
-  # Fetch the JSON file
+  # Fetch the JSON file and read its content
   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;
+  fonts = builtins.fromJSON (builtins.readFile fontsJson);
   packageNames = map (font: font.package) fonts;
 in
 {
@@ -18,5 +18,5 @@ in
       comic-mono
       nerdfonts
     ]
-    ++ packageNames;
+    ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
 }