From 83166cad43b5f1ff3671c2db0c58dbea5ec866d9 Mon Sep 17 00:00:00 2001 From: Spencer Brower Date: Tue, 17 Sep 2024 10:27:56 -0400 Subject: [PATCH] feat: Replaced default template with the PHP template. --- flake.nix | 6 +-- templates/default/.envrc | 1 - templates/default/.gitignore | 4 -- templates/default/flake.nix | 91 ------------------------------------ 4 files changed, 3 insertions(+), 99 deletions(-) delete mode 100644 templates/default/.envrc delete mode 100644 templates/default/.gitignore delete mode 100644 templates/default/flake.nix diff --git a/flake.nix b/flake.nix index 9787485..3219289 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Utilities for running Laravel, particularly with Vagrant"; + description = "Utilities for running Laravel, particularly with nix run"; outputs = { nixpkgs, self }: { nixosModules = { @@ -9,8 +9,8 @@ templates = { default = { - path = ./templates/default; - description = "A simple boilerplate for running Laravel on NixOS in a Vagrant machine."; + path = ./templates/php; + description = "A simple boilerplate for running Laravel with nix run."; }; nodejs = { path = ./templates/nodejs; diff --git a/templates/default/.envrc b/templates/default/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/templates/default/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/templates/default/.gitignore b/templates/default/.gitignore deleted file mode 100644 index 1f04325..0000000 --- a/templates/default/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.direnv -.vagrant -node_modules -vendor diff --git a/templates/default/flake.nix b/templates/default/flake.nix deleted file mode 100644 index e5ca73f..0000000 --- a/templates/default/flake.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - # description = "A very basic flake"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/23.11"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - - - flake-parts.url = "github:hercules-ci/flake-parts"; - # process-compose-flake.url = "github:Platonic-Systems/process-compose-flake"; - treefmt-nix.url = "github:numtide/treefmt-nix"; - treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; - - # sbrow.url = "github:sbrow/nix"; - }; - - outputs = inputs@{ self, flake-parts, nixpkgs, nixpkgs-unstable/*, process-compose-flake, sbrow */, treefmt-nix }: - flake-parts.lib.mkFlake { inherit inputs; } { - # debug = true; - - systems = [ "x86_64-linux" ]; - - imports = [ - # inputs.process-compose-flake.flakeModule - inputs.treefmt-nix.flakeModule - ]; - - perSystem = { inputs', pkgs, system, ... }: { - _module.args.pkgs = import nixpkgs { - inherit system; - config.allowUnfree = true; - - overlays = [ - (final: prev: { unstable = inputs'.nixpkgs-unstable.legacyPackages; }) - ]; - }; - - #formatter = pkgs.nixpkgs-fmt; - treefmt = { - # Used to find the project root - projectRootFile = "flake.nix"; - - # Format nix files - programs.nixpkgs-fmt.enable = true; - - # Format php files - settings.formatter."pint" = - { - command = "./vendor/bin/pint"; - includes = [ "*[!.blade].php" ]; - excludes = [ "_ide_helper*.php" ]; - }; - - # Format blade files - settings.formatter."blade-formatter" = { - command = "./bin/blade-formatter"; - options = [ "--write" ]; - includes = [ "*.blade.php" ]; - }; - - # Format js, json, and yaml files - programs.prettier.enable = true; - settings.formatter.prettier = - { - excludes = [ - "public/**" - "resources/js/modernizr.js" - "storage/app/caniuse.json" - "*.md" - ]; - }; - - # Format elm components - programs.elm-format.enable = true; - - # Override the default package - #programs.terraform.package = nixpkgs.terraform_1; - }; - - devShells.default = pkgs.mkShell - { - buildInputs = with pkgs; [ - # config.treefmt.build.wrapper - # Your packages here - ]; - }; - - # process-compose.default.settings = { }; - }; - }; -}