From 260b59c751ecdd75dfe2ee1af58359a8fbe85eb9 Mon Sep 17 00:00:00 2001
From: Alex <alexmat2on@protonmail.com>
Date: Thu, 1 Aug 2024 18:37:21 -0400
Subject: [PATCH] thelio76: move ff addons to overlay instead of special arg

---
 config/apps/firefox.nix         |  4 ++--
 config/modules/home-manager.nix |  6 +++---
 flake.nix                       | 11 +++++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/config/apps/firefox.nix b/config/apps/firefox.nix
index 9803be6..505bd6a 100644
--- a/config/apps/firefox.nix
+++ b/config/apps/firefox.nix
@@ -1,4 +1,4 @@
-{ pkgs, firefox-addons, ... }:
+{ pkgs, ... }:
 {
   programs.firefox = {
     enable = true;
@@ -26,7 +26,7 @@
         "browser.urlbar.suggest.quicksuggest.sponsored" = false;
         "extensions.autoDisableScopes" = 0;
       };
-      extensions = with firefox-addons; [
+      extensions = with pkgs.firefox-addons; [
         darkreader
         multi-account-containers
         simple-tab-groups
diff --git a/config/modules/home-manager.nix b/config/modules/home-manager.nix
index fb682f7..2394a99 100644
--- a/config/modules/home-manager.nix
+++ b/config/modules/home-manager.nix
@@ -1,14 +1,14 @@
-{ system, inputs, user, ... }:
+{ system, home-manager, user, ... }:
 {
   modules = [
-    inputs.home-manager.nixosModules.home-manager
+    home-manager.nixosModules.home-manager
     {
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.backupFileExtension = "backup";
       home-manager.users.${user} = import ../users/${user};
 
-      home-manager.extraSpecialArgs = { inherit user; firefox-addons = inputs.firefox-addons.packages.${system}; };
+      home-manager.extraSpecialArgs = { inherit user; };
     }
   ];
 }
diff --git a/flake.nix b/flake.nix
index f137f4d..8fdae09 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,14 +26,21 @@
       pcUser = "alex";
       pcSystem = "x86_64-linux";
 
+      overlays = [
+        atau-nixpkgs.overlays.default
+        (final: prev: {
+          firefox-addons = firefox-addons.packages.${system};
+        })
+      ];
+
       # This helper function generates a nixos system for a linux PC setup. It defaults the username, architecture, and flake inputs if not provided.
       mkPcSystem = { user ? pcUser, hostname, system ? pcSystem, inputs ? flake-inputs }: nixpkgs.lib.nixosSystem {
         inherit system;
         modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ atau-nixpkgs.overlays.default ]; })
+          ({ config, pkgs, ... }: { nixpkgs.overlays = overlays; })
           ./config/hosts/${hostname}
         ] ++ (import ./config/modules/home-manager.nix {
-          inherit system inputs user;
+          inherit system home-manager user;
         }).modules;
       };
     in