From 039df7aeb601a1d831e5907670d6e46870db3f35 Mon Sep 17 00:00:00 2001 From: Spencer Brower Date: Wed, 8 Jul 2026 17:06:09 -0400 Subject: [PATCH] build(nix): Removed `Caddyfile` and updated flake. --- Caddyfile | 34 ---------------------------------- flake.lock | 33 ++++++++++----------------------- flake.nix | 19 +++++-------------- 3 files changed, 15 insertions(+), 71 deletions(-) delete mode 100644 Caddyfile diff --git a/Caddyfile b/Caddyfile deleted file mode 100644 index 3b3788e..0000000 --- a/Caddyfile +++ /dev/null @@ -1,34 +0,0 @@ -(cors) { - @origin header Origin {args[0]} - header @origin Access-Control-Allow-Origin "{args[0]}" - header @origin Access-Control-Allow-Methods "OPTIONS,HEAD,GET,POST,PUT,PATCH,DELETE" -} - -wp.test { - root * . - - encode zstd gzip - file_server - php_fastcgi 127.0.0.1:9009 - - tls internal -} - -laravel.test { - # import cors laravel.test - - respond /caddy/live OK - - root * ./public - - try_files {path} page-cache/{path}.html page-cache/{path}.json page-cache/{path}.xml - - encode zstd gzip - file_server - php_fastcgi 127.0.0.1:9009 - - # Uncomment for Laravel Octane - # reverse_proxy :8000 - - tls internal -} diff --git a/flake.lock b/flake.lock index 85ef1eb..e4b1283 100644 --- a/flake.lock +++ b/flake.lock @@ -20,15 +20,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783279667, - "narHash": "sha256-2l8yOB5aYd+05Q9V9Y1YhgbSa1j1o5QX+nvYs5FL80A=", - "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1028110.f205b5574fd0/nixexprs.tar.xz" + "lastModified": 1783389287, + "narHash": "sha256-0xIy4dVLqq47rA+mRy0hXDfjhQd4E5PoIns/RmB7nR4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0ad6f47ea4fe188f4bc8f0380f93ae8523337c6c", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -62,27 +65,11 @@ "type": "github" } }, - "process-compose-flake": { - "locked": { - "lastModified": 1782060835, - "narHash": "sha256-Q8HH2t1l3MITtWCWY4ytcH5F/Q7aAHo3Iq/QTMAKTe0=", - "owner": "Platonic-Systems", - "repo": "process-compose-flake", - "rev": "464ff6880737f063c3f0d3d2c7781fda9190868f", - "type": "github" - }, - "original": { - "owner": "Platonic-Systems", - "repo": "process-compose-flake", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", - "process-compose-flake": "process-compose-flake", "treefmt-nix": "treefmt-nix" } }, diff --git a/flake.nix b/flake.nix index b5241ef..ef87494 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,12 @@ { - description = "A dev environment"; + description = "libzmq bindings for odin"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; - process-compose-flake.url = "github:Platonic-Systems/process-compose-flake"; + # process-compose-flake.url = "github:Platonic-Systems/process-compose-flake"; treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -16,7 +16,7 @@ , flake-parts , nixpkgs , nixpkgs-unstable - , process-compose-flake + # , process-compose-flake , treefmt-nix }: flake-parts.lib.mkFlake { inherit inputs; } { @@ -54,7 +54,7 @@ programs.deadnix.enable = true; # Format js, json, and yaml files - programs.prettier.enable = true; + programs.prettier.enable = false; settings.formatter.prettier = { excludes = [ @@ -66,15 +66,6 @@ }; }; - /* - process-compose.default.settings.processes = { - web.command = "sudo ${pkgs.caddy}/bin/caddy run"; - mail.command = "${pkgs.mailhog}/bin/MailHog"; - php.command = "${php}/bin/php-fpm -F -y php-fpm.conf"; - redis.command = "${$pks.redis}/bin/redis-server"; - }; - */ - devShells.default = pkgs.mkShell { buildInputs = with pkgs; [