nix: fix overlays

flake.lock

@@ -466,22 +466,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1680122840,
-        "narHash": "sha256-zCQ/9iFHzCW5JMYkkHMwgK1/1/kTMgCMHq4THPINpAU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a575c243c23e2851b78c00e9fa245232926ec32f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1680110233,
@@ -498,6 +482,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1680122840,
+        "narHash": "sha256-zCQ/9iFHzCW5JMYkkHMwgK1/1/kTMgCMHq4THPINpAU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a575c243c23e2851b78c00e9fa245232926ec32f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nlsp-settings-nvim": {
       "flake": false,
       "locked": {

flake.nix

@@ -113,7 +113,7 @@
           };
         })
     // {
-      overlays.default = import ./packages;
+      overlays.default = final: prev: import ./packages { inherit (prev) lib callPackage; };
 
       nixosConfigurations =
         nixpkgs.lib.mapAttrs

nixos/modules/nix.nix

@@ -29,7 +29,7 @@ in
       (pkg: elem (lib.getName pkg) cfg.allowUnfreePackages);
 
     nixpkgs.overlays = lib.mkBefore [
-      # inputs.self.overlays.default
+      inputs.self.overlays.default
       (final: prev: {
         unstable = import inputs.nixpkgs-unstable {
           inherit (config.nixpkgs) config overlays system;

packages/default.nix

@@ -1,10 +1,7 @@
 { lib, callPackage }:
 
 
-lib.mkMerge [
-  (callPackage ./woodpecker { })
-
-  {
+(import ./woodpecker { inherit callPackage; }) //
+{
   myip = callPackage ./myip.nix { };
-  }
-]
+}