Revert "feat: try new caddy package"

This reverts commit a3bc5be.
ajaxbits · Nov 20, 2023 · 75f153c · 75f153c
1 parent a3bc5be
commit 75f153c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/components/caddy/default.nix b/components/caddy/default.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
   cfg = config.components.caddy;
@@ -29,7 +28,6 @@ in {
 
   config = lib.mkMerge [
     {services.caddy.enable = cfg.enable;}
-    {services.caddy.package = pkgs.cloudflare-caddy;}
     monitorConfig
   ];
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -19,7 +19,7 @@
 
     # custom pkgs
     caddy = {
-      url = "github:burmudar/nix-cloudflare-caddy";
+      url = "github:ajaxbits/nixos-caddy-patched";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -60,7 +60,9 @@
         pkgs = import nixpkgs {
           inherit system;
           overlays = [
-            caddy.overlay
+            (_self: super: {
+              caddy-patched = caddy.packages.${system}.caddy;
+            })
           ];
         };
         pkgsUnfree = unfree.legacyPackages.${system};