This commit is contained in:
Oliver Davies 2025-07-30 01:16:41 +01:00
parent 7213017208
commit 6c6bbd9338
2 changed files with 21 additions and 12 deletions

16
flake.lock generated
View file

@ -20,6 +20,21 @@
"type": "github" "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750365781, "lastModified": 1750365781,
@ -55,6 +70,7 @@
"root": { "root": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"import-tree": "import-tree",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-php74": "nixpkgs-php74" "nixpkgs-php74": "nixpkgs-php74"
} }

View file

@ -3,28 +3,23 @@
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
import-tree.url = "github:vic/import-tree";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-php74.url = "github:nixos/nixpkgs/81b77fd3847a"; nixpkgs-php74.url = "github:nixos/nixpkgs/81b77fd3847a";
}; };
outputs = outputs =
inputs@{ flake-parts, ... }: inputs:
flake-parts.lib.mkFlake { inherit inputs; } { inputs.flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ "x86_64-linux" ]; systems = [ "x86_64-linux" ];
_module.args = { _module.args = {
commonPhpPackages = pkgs: with pkgs; [ phpactor ]; commonPhpPackages = pkgs: with pkgs; [ phpactor ];
}; };
imports = [ imports = [ (inputs.import-tree ./modules) ];
./modules/nodejs.nix
./modules/php74.nix
./modules/php81.nix
./modules/php82.nix
./modules/php83.nix
./modules/tailwindcss.nix
];
perSystem = perSystem =
{ pkgs, ... }: { pkgs, ... }:
@ -32,8 +27,6 @@
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
packages = with pkgs; [ nixd ]; packages = with pkgs; [ nixd ];
}; };
formatter = pkgs.nixfmt-rfc-style;
}; };
}; };
} }