diff --git a/flake.lock b/flake.lock index f37a93f..546ce4c 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,21 @@ "type": "github" } }, + "import-tree": { + "locked": { + "lastModified": 1752730890, + "narHash": "sha256-GES8fapSLGz36MMPRVNkSUWXUTtqvGQNXHjRmRLfJUY=", + "owner": "vic", + "repo": "import-tree", + "rev": "6ebb8cb87987b20264c09296166543fd3761d274", + "type": "github" + }, + "original": { + "owner": "vic", + "repo": "import-tree", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1750365781, @@ -55,6 +70,7 @@ "root": { "inputs": { "flake-parts": "flake-parts", + "import-tree": "import-tree", "nixpkgs": "nixpkgs", "nixpkgs-php74": "nixpkgs-php74" } diff --git a/flake.nix b/flake.nix index 4e5b238..0aee0ac 100644 --- a/flake.nix +++ b/flake.nix @@ -3,28 +3,23 @@ flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; + import-tree.url = "github:vic/import-tree"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-php74.url = "github:nixos/nixpkgs/81b77fd3847a"; }; outputs = - inputs@{ flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } { + inputs: + inputs.flake-parts.lib.mkFlake { inherit inputs; } { systems = [ "x86_64-linux" ]; _module.args = { commonPhpPackages = pkgs: with pkgs; [ phpactor ]; }; - imports = [ - ./modules/nodejs.nix - ./modules/php74.nix - ./modules/php81.nix - ./modules/php82.nix - ./modules/php83.nix - ./modules/tailwindcss.nix - ]; + imports = [ (inputs.import-tree ./modules) ]; perSystem = { pkgs, ... }: @@ -32,8 +27,6 @@ devShells.default = pkgs.mkShell { packages = with pkgs; [ nixd ]; }; - - formatter = pkgs.nixfmt-rfc-style; }; }; }