From 89c0dc3e28ed8405cb770343546db61d6a6ea2f6 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sat, 15 Nov 2025 18:51:59 -0500
Subject: [PATCH] [flake] Remove manually configured packages list

---
 flake.nix                                          |  2 +-
 nixosModules/programs/firefox/extensions.nix       |  2 --
 packages/default.nix => packages.nix               | 14 +++++---------
 packages/anubis-files/{default.nix => package.nix} |  0
 packages/doc2dash/{default.nix => package.nix}     |  0
 .../jellyfin-exporter/{default.nix => package.nix} |  0
 .../{default.nix => package.nix}                   |  0
 7 files changed, 6 insertions(+), 12 deletions(-)
 rename packages/default.nix => packages.nix (57%)
 rename packages/anubis-files/{default.nix => package.nix} (100%)
 rename packages/doc2dash/{default.nix => package.nix} (100%)
 rename packages/jellyfin-exporter/{default.nix => package.nix} (100%)
 rename packages/pingvin-share-config/{default.nix => package.nix} (100%)

diff --git a/flake.nix b/flake.nix
index 636f5606..72cfb5c0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -113,7 +113,7 @@
         inputs.easy-hosts.flakeModule
         inputs.home-manager.flakeModules.home-manager
         inputs.treefmt-nix.flakeModule
-        ./packages
+        ./packages.nix
         ./lib
         ./overlays
         ./devShells
diff --git a/nixosModules/programs/firefox/extensions.nix b/nixosModules/programs/firefox/extensions.nix
index a9e6d6ee..b87f678a 100644
--- a/nixosModules/programs/firefox/extensions.nix
+++ b/nixosModules/programs/firefox/extensions.nix
@@ -32,8 +32,6 @@ in
   "{30280527-c46c-4e03-bb16-2e3ed94fa57c}" = mkAMO "protondb-for-steam";
   "redirector@einaregilsson.com" = mkAMO "redirector";
   "{a4c4eda4-fb84-4a84-b4a1-f7c1cbf2a1ad}" = mkAMO "refined-github-";
-  "{762f9885-5a13-4abd-9c77-433dcd38b8fd}" = mkAMO "return-youtube-dislikes";
-  "{48748554-4c01-49e8-94af-79662bf34d50}" = mkAMO "privacy-pass";
   "sponsorBlocker@ajay.app" = mkAMO "sponsorblock";
   "firefox-extension@steamdb.info" = mkAMO "steam-database";
   "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}" = mkAMO "styl-us" // {
diff --git a/packages/default.nix b/packages.nix
similarity index 57%
rename from packages/default.nix
rename to packages.nix
index 44122be6..5f5f821c 100644
--- a/packages/default.nix
+++ b/packages.nix
@@ -1,5 +1,4 @@
-_: {
-
+{
   perSystem =
     {
       pkgs,
@@ -7,13 +6,10 @@ _: {
       ...
     }:
     let
-      packages = lib.makeScope pkgs.newScope (_: {
-        anubis-files = pkgs.callPackage ./anubis-files { };
-        doc2dash = pkgs.callPackage ./doc2dash { };
-        jellyfin-exporter = pkgs.callPackage ./jellyfin-exporter { };
-        pingvin-share-config = pkgs.callPackage ./pingvin-share-config { };
-
-      });
+      packages = lib.packagesFromDirectoryRecursive {
+        inherit (pkgs) callPackage;
+        directory = ./packages;
+      };
     in
     {
       legacyPackages = packages;
diff --git a/packages/anubis-files/default.nix b/packages/anubis-files/package.nix
similarity index 100%
rename from packages/anubis-files/default.nix
rename to packages/anubis-files/package.nix
diff --git a/packages/doc2dash/default.nix b/packages/doc2dash/package.nix
similarity index 100%
rename from packages/doc2dash/default.nix
rename to packages/doc2dash/package.nix
diff --git a/packages/jellyfin-exporter/default.nix b/packages/jellyfin-exporter/package.nix
similarity index 100%
rename from packages/jellyfin-exporter/default.nix
rename to packages/jellyfin-exporter/package.nix
diff --git a/packages/pingvin-share-config/default.nix b/packages/pingvin-share-config/package.nix
similarity index 100%
rename from packages/pingvin-share-config/default.nix
rename to packages/pingvin-share-config/package.nix
-- 
2.51.2