diff --git a/templates/default/Vagrantfile b/templates/default/Vagrantfile deleted file mode 100644 index fce8d60..0000000 --- a/templates/default/Vagrantfile +++ /dev/null @@ -1,32 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -Vagrant.configure("2") do |config| - config.vm.box = "nixos" - - # Disable automatic box update checking. If you disable this, then - # boxes will only be checked for updates when the user runs - # `vagrant box outdated`. This is not recommended. - # config.vm.box_check_update = false - - # config.vm.network "forwarded_port", guest: 80, host: 80 - # config.vm.network "forwarded_port", guest: 443, host: 443 - config.vm.network "private_network", ip: "192.168.56.44", auto_config: false - # config.vm.network "public_network" - - config.vm.provider "virtualbox" do |vb| - # Display the VirtualBox GUI when booting the machine - vb.gui = false - - # Customize the amount of memory on the VM: - # vb.memory = 4 * 1024 - - # vb.cpus = 2; - end - - config.vm.provision "shell", inline: <<-SHELL - # nix develop 'nixpkgs#git' --command "sudo nixos-rebuild switch --flake /vagrant#vagrant" - nix-shell -p git --command "sudo nixos-rebuild switch --flake /vagrant#vagrant" - SHELL - end - \ No newline at end of file diff --git a/templates/default/flake.nix b/templates/default/flake.nix index 605f0ee..87075c8 100644 --- a/templates/default/flake.nix +++ b/templates/default/flake.nix @@ -2,25 +2,26 @@ description = "A very basic flake"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/23.05"; + # nixpkgs.url = "github:NixOS/nixpkgs/23.11"; sbrow.url = "github:sbrow/nix"; - flake-utils.url = "github:numtide/flake-utils"; + flake-parts.url = "github:hercules-ci/flake-parts"; }; - outputs = { self, flake-utils, nixpkgs, sbrow }: - flake-utils.lib.eachSystem flake-utils.lib.allSystems - (system: - let pkgs = nixpkgs.legacyPackages.${system}; in - { - formatter = pkgs.nixpkgs-fmt; + outputs = inputs@{ self, flake-parts, nixpkgs, sbrow }: + flake-parts.lib.mkFlake { inherit inputs; } { + systems = [ "x86_64-linux" ]; - devShells.default = pkgs.mkShell - { - buildInputs = with pkgs; [ - # Your packages here - ]; - }; - }); + perSystem = { pkgs, system, ... }: { + formatter = pkgs.nixpkgs-fmt; + + devShells.default = pkgs.mkShell + { + buildInputs = with pkgs; [ + # Your packages here + ]; + }; + }; + }; } diff --git a/templates/nodejs/.gitignore b/templates/nodejs/.gitignore index 2362848..1f04325 100644 --- a/templates/nodejs/.gitignore +++ b/templates/nodejs/.gitignore @@ -1,2 +1,4 @@ .direnv +.vagrant node_modules +vendor diff --git a/templates/nodejs/flake.nix b/templates/nodejs/flake.nix index 5fc18ce..c932bda 100644 --- a/templates/nodejs/flake.nix +++ b/templates/nodejs/flake.nix @@ -2,21 +2,26 @@ description = "A very basic flake"; inputs = { - flake-utils.url = "github:numtide/flake-utils"; - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + # nixpkgs.url = "github:NixOS/nixpkgs/23.11"; + + sbrow.url = "github:sbrow/nix"; + + flake-parts.url = "github:hercules-ci/flake-parts"; }; - outputs = { self, flake-utils, nixpkgs }: flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - in - { - formatter = pkgs.nixpkgs-fmt; + outputs = inputs@{ self, flake-parts, nixpkgs, sbrow }: + flake-parts.lib.mkFlake { inherit inputs; } { + systems = [ "x86_64-linux" ]; - devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ - yarn - ]; + perSystem = { pkgs, system, ... }: { + formatter = pkgs.nixpkgs-fmt; + + devShells.default = pkgs.mkShell + { + buildInputs = with pkgs; [ + yarn + ]; + }; }; - }); + }; } diff --git a/templates/php/flake.nix b/templates/php/flake.nix index 4cdd9e4..ee70db3 100644 --- a/templates/php/flake.nix +++ b/templates/php/flake.nix @@ -1,25 +1,33 @@ { - description = "A basic php setup for local development"; + description = "A very basic flake"; inputs = { - flake-utils.url = "github:numtide/flake-utils"; - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + # nixpkgs.url = "github:NixOS/nixpkgs/23.11"; + # phps.url = "github:fossar/nix-phps"; + # phps.inputs.nixpkgs.follows = "nixpkgs"; + + sbrow.url = "github:sbrow/nix"; + + flake-parts.url = "github:hercules-ci/flake-parts"; }; - outputs = { self, flake-utils, nixpkgs }: flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - in - { - formatter = pkgs.nixpkgs-fmt; + outputs = inputs@{ self, flake-parts, nixpkgs, /* phps, */ sbrow }: + flake-parts.lib.mkFlake { inherit inputs; } { + systems = [ "x86_64-linux" ]; - devShells.default = pkgs.mkShell { - packages = with pkgs; [ - caddy - foreman - php - phpPackages.composer - ]; + perSystem = { pkgs, system, ... }: + /* let phpPkgs = phps.legacyPackages.${system}; in */ { + formatter = pkgs.nixpkgs-fmt; + + devShells.default = pkgs.mkShell + { + buildInputs = with pkgs; [ + caddy + foreman + php + phpPackages.composer + ]; + }; }; - }); + }; }