2 files changed, 30 insertions, 32 deletions
diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix
index 6a8f12e..a8b5445 100644
--- a/pkgs/all-packages.nix
+++ b/pkgs/all-packages.nix
@@ -1,21 +1,28 @@
-pkgs: let
-  inherit (pkgs) callPackage;
-in {
-  # original packages
-  cfspeedtest = callPackage ./cfspeedtest.nix {};
-  check-pr = callPackage ./check-pr.nix {};
-  fastfetch = callPackage ./fastfetch.nix {};
-  huion = callPackage ./huion.nix {};
-  klassy = pkgs.libsForQt5.callPackage ./klassy.nix {};
-  mommy = callPackage ./mommy.nix {};
-  nixgc = callPackage ./nixgc.nix {};
-  modrinth-app-unwrapped = callPackage ./modrinth-app {
-    inherit (pkgs.nodePackages) pnpm;
-    inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security WebKit;
+{
+  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 {};
   };
-  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
+  packages
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 8471def..cd49eb2 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,22 +1,13 @@
-{
-  self,
-  inputs,
-  ...
-}: {
+_: {
   perSystem = {
     lib,
     pkgs,
     system,
     ...
   }: {
-    _module.args.pkgs = import inputs.nixpkgs {
-      inherit system;
-      overlays = [self.overlays.default];
-    };
-
     packages = let
       p = let
-        packages = import ./all-packages.nix pkgs;
+        packages = import ./all-packages.nix {prev = pkgs;};
       in
         lib.filterAttrs (_: v:
           builtins.elem system (v.meta.platforms or []) && !(v.meta.broken or false))
@@ -25,5 +16,5 @@
       p // {default = p.treefetch;};
   };
 
-  flake.overlays.default = final: _: import ./all-packages.nix final;
+  flake.overlays.default = final: prev: import ./all-packages.nix {inherit final prev;};
 }