2 files changed, 40 insertions, 30 deletions

diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix
index a8b5445..e179817 100644
--- a/pkgs/all-packages.nix
+++ b/pkgs/all-packages.nix
@@ -1,28 +1,32 @@
-{
-  final ? {},
-  prev,
-}: let
+final: prev: let
   inherit (prev) callPackage;
-  callPackage' =
-    final.callPackage or prev.lib.callPackageWith (prev // packages);
-
-  packages = {
-    cfspeedtest = callPackage ./cfspeedtest.nix {};
-    check-pr = callPackage ./check-pr.nix {};
-    fastfetch = callPackage ./fastfetch.nix {};
-    huion = callPackage ./huion.nix {};
-    klassy = prev.libsForQt5.callPackage ./klassy.nix {};
-    mommy = callPackage ./mommy.nix {};
-    nixgc = callPackage ./nixgc.nix {};
-    modrinth-app-unwrapped = callPackage ./modrinth-app {
-      inherit (prev.nodePackages) pnpm;
-      inherit (prev.darwin.apple_sdk.frameworks) CoreServices Security WebKit;
-    };
-    modrinth-app = callPackage' ./modrinth-app/wrapper.nix {};
-    treefetch = callPackage ./treefetch.nix {};
-    swhkd = callPackage ./swhkd {};
-    vim-just = callPackage ./vim-just.nix {};
-    xwaylandvideobridge = callPackage ./xwaylandvideobridge.nix {};
+in {
+  cfspeedtest = callPackage ./cfspeedtest.nix {};
+
+  check-pr = callPackage ./check-pr.nix {};
+
+  fastfetch = callPackage ./fastfetch.nix {};
+
+  huion = callPackage ./huion.nix {};
+
+  klassy = prev.libsForQt5.callPackage ./klassy.nix {};
+
+  mommy = callPackage ./mommy.nix {};
+
+  nixgc = callPackage ./nixgc.nix {};
+
+  modrinth-app-unwrapped = final.callPackage ./modrinth-app {
+    inherit (prev.nodePackages) pnpm;
+    inherit (prev.darwin.apple_sdk.frameworks) CoreServices Security WebKit;
   };
-in
-  packages
+
+  modrinth-app = final.callPackage ./modrinth-app/wrapper.nix {};
+
+  treefetch = callPackage ./treefetch.nix {};
+
+  swhkd = callPackage ./swhkd {};
+
+  vim-just = callPackage ./vim-just.nix {};
+
+  xwaylandvideobridge = callPackage ./xwaylandvideobridge.nix {};
+}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index cd49eb2..399a8fd 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -6,15 +6,21 @@ _: {
     ...
   }: {
     packages = let
+      inherit (builtins) elem;
+      inherit (lib) filterAttrs makeScope;
+      inherit (pkgs) newScope;
+
       p = let
-        packages = import ./all-packages.nix {prev = pkgs;};
+        packages = makeScope newScope (final: import ./all-packages.nix final pkgs);
       in
-        lib.filterAttrs (_: v:
-          builtins.elem system (v.meta.platforms or []) && !(v.meta.broken or false))
+        filterAttrs (_: v:
+          elem system (v.meta.platforms or []) && !(v.meta.broken or false))
         packages;
     in
       p // {default = p.treefetch;};
   };
 
-  flake.overlays.default = final: prev: import ./all-packages.nix {inherit final prev;};
+  flake = {
+    overlays.default = final: prev: (import ./all-packages.nix final prev);
+  };
 }