diff --git a/flake.lock b/flake.lock index b06e659..e116df5 100755 --- a/flake.lock +++ b/flake.lock @@ -177,11 +177,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -209,11 +209,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -239,6 +239,22 @@ } }, "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "locked": { "lastModified": 1688025799, "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", @@ -253,7 +269,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_7": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -267,7 +283,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_7": { + "flake-compat_8": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -327,7 +343,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -345,7 +361,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -363,7 +379,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -931,7 +947,7 @@ }, "nix-search-cli": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": [ "shelvacu", "flake-utils" @@ -958,7 +974,7 @@ }, "nix-search-cli-unstable": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-utils": [ "shelvacu", "flake-utils" @@ -985,7 +1001,7 @@ }, "nixos-apple-silicon-unstable": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "nixpkgs": [ "shelvacu", "nixpkgs-unstable" @@ -1085,6 +1101,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1744502386, + "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1733348545, "narHash": "sha256-b4JrUmqT0vFNx42aEN9LTWOHomkTKL/ayLopflVf81U=", @@ -1102,7 +1134,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "home-manager": [ @@ -1135,7 +1167,7 @@ "nixvim-unstable": { "inputs": { "devshell": "devshell_2", - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_8", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks_2", "home-manager": [ @@ -1362,9 +1394,29 @@ "type": "github" } }, - "purescript-overlay": { + "phps": { "inputs": { "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs_2", + "utils": "utils" + }, + "locked": { + "lastModified": 1744610086, + "narHash": "sha256-weX7WoOM/Gn8aIO81dgA94Msalch6nUpjssIJOPuWK8=", + "owner": "fossar", + "repo": "nix-phps", + "rev": "931af19caf5fbe50ea8b568c2fbfa1c8b35174e8", + "type": "github" + }, + "original": { + "owner": "fossar", + "repo": "nix-phps", + "type": "github" + } + }, + "purescript-overlay": { + "inputs": { + "flake-compat": "flake-compat_2", "nixpkgs": [ "shelvacu", "nix-inspect", @@ -1390,7 +1442,7 @@ }, "purescript-overlay_2": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ "shelvacu", "nix-inspect-unstable", @@ -1451,6 +1503,7 @@ "root": { "inputs": { "nixpkgs": "nixpkgs", + "phps": "phps", "shelvacu": "shelvacu" } }, @@ -1548,7 +1601,7 @@ "nix-search-cli-unstable": "nix-search-cli-unstable", "nixos-apple-silicon-unstable": "nixos-apple-silicon-unstable", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "nixvim-unstable": "nixvim-unstable", @@ -1704,6 +1757,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt": { "inputs": { "nixpkgs": [ @@ -1815,6 +1883,24 @@ "type": "github" } }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "vscode-server": { "inputs": { "flake-utils": [ diff --git a/flake.nix b/flake.nix index 23484bb..cb50806 100755 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; shelvacu.url = "git+https://git.uninsane.org/shelvacu/nix-stuff"; + phps.url = "github:fossar/nix-phps"; }; outputs = { self, nixpkgs, ... }@inputs: diff --git a/hosts/marauder/default.nix b/hosts/marauder/default.nix index f42431b..509ecc2 100755 --- a/hosts/marauder/default.nix +++ b/hosts/marauder/default.nix @@ -6,6 +6,7 @@ self.nixosModules.zerotier ./backup.nix ./dev.nix + ./phpdev.nix ./printing.nix ]; diff --git a/hosts/marauder/phpdev.nix b/hosts/marauder/phpdev.nix new file mode 100755 index 0000000..d91df2e --- /dev/null +++ b/hosts/marauder/phpdev.nix @@ -0,0 +1,23 @@ +{ pkgs, inputs, ... }: +{ + services.mysql = { + enable = true; + package = pkgs.mariadb; + }; + + services.httpd = { + enable = true; + adminAddr = "admin@localhost"; + enablePHP = true; + virtualHosts = { + "localhost" = { + documentRoot = "/var/www/localhost"; + locations."/".index = "index.html index.php"; + }; + }; + }; + + environment.systemPackages = [ + inputs.phps.packages.x86_64-linux.php72 + ]; +}