diff --git a/flake.lock b/flake.lock index 91c7904..a90eb38 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 04a70d0..c4e243e 100644 --- a/flake.nix +++ b/flake.nix @@ -14,14 +14,15 @@ flake-parts.lib.mkFlake {inherit inputs;} { systems = nixpkgs.lib.systems.flakeExposed; - flake = { - lib = nixpkgs.lib.extend (import ./lib.nix); - - nixosConfigurations = self.lib.genNixosConfigurations {inherit inputs;}; - }; - - perSystem = {pkgs, ...}: { - packages.default = pkgs.callPackage ./package.nix {}; + perSystem = {lib, pkgs, ...}: { + packages = let + packages = lib.packagesFromDirectoryRecursive { + inherit (pkgs) callPackage; + directory = ./packages; + }; + in packages // { + default = packages.helix; + }; }; }; } diff --git a/package.nix b/packages/helix/package.nix similarity index 100% rename from package.nix rename to packages/helix/package.nix