diff --git a/build.yaml b/build.yaml index 847a92031..33fc8f31b 100644 --- a/build.yaml +++ b/build.yaml @@ -14,6 +14,3 @@ git: ignore: - '/source/build/' - '/node_modules/' - -experimental: - createTmuxStartupFile: true diff --git a/flake.lock b/flake.lock index 58815101b..f8efa105a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,82 +1,12 @@ { "nodes": { - "devshell": { - "inputs": { - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1695195896, - "narHash": "sha256-pq9q7YsGXnQzJFkR5284TmxrLNFc0wo4NQ/a5E93CQU=", - "owner": "numtide", - "repo": "devshell", - "rev": "05d40d17bf3459606316e3e9ec683b784ff28f16", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, "nixpkgs": { "locked": { - "lastModified": 1677383253, - "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9952d6bc395f5841262b006fbace8dd7e143b634", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -88,24 +18,7 @@ }, "root": { "inputs": { - "devshell": "devshell", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 0350d50fc..b2bf3657a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,27 +1,19 @@ # Do not edit this file. It is automatically generated by https://www.oliverdavies.uk/build-configs. { - inputs = { - devshell.url = "github:numtide/devshell"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - }; + description = "A Nix Flake for oliverdavies-uk"; - outputs = inputs@{ flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } { - imports = [ inputs.devshell.flakeModule ]; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - systems = [ "x86_64-linux" ]; + outputs = { nixpkgs, ... }: + let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; - perSystem = { config, self', inputs', pkgs, system, ... }: { - formatter = pkgs.nixfmt; + inherit (pkgs) mkShell; + in { + devShells.${system}.default = + mkShell { buildInputs = with pkgs; [ nodePackages.pnpm nodejs php82 php82Packages.composer ]; }; - devshells.default = { - packages = with pkgs; [ - "nodePackages.pnpm" - "nodejs" - "php82" - "php82Packages.composer" - ]; - }; - }; + formatter.${system} = pkgs.nixfmt; }; }