From a3bc5be2ff7843aedbf95883270461929b243b70 Mon Sep 17 00:00:00 2001
From: Alex Jackson <contact@ajaxbits.com>
Date: Sun, 19 Nov 2023 21:40:10 -0600
Subject: [PATCH] feat: try new caddy package

---
 components/caddy/default.nix |  2 ++
 flake.lock                   | 14 +++++++-------
 flake.nix                    |  6 ++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/caddy/default.nix b/components/caddy/default.nix
index 32a63b7..a29135b 100644
--- a/components/caddy/default.nix
+++ b/components/caddy/default.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }: let
   cfg = config.components.caddy;
@@ -28,6 +29,7 @@ in {
 
   config = lib.mkMerge [
     {services.caddy.enable = cfg.enable;}
+    {services.caddy.package = pkgs.cloudflare-caddy;}
     monitorConfig
   ];
 }
diff --git a/flake.lock b/flake.lock
index 18ff914..5e97de3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -48,16 +48,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1700449293,
-        "narHash": "sha256-kqjjLzgZ/UNXuR+p3TXY4YqRhEAuZQ/0PnLMfDLL8U4=",
-        "owner": "ajaxbits",
-        "repo": "nixos-caddy-patched",
-        "rev": "94de6dfe3c5e3f2db29bca8f935f7c060564235d",
+        "lastModified": 1692124400,
+        "narHash": "sha256-2/ajrhDlEL4UyE1mnbFQsOnLYUI5naBbPO/Kk8ZrgVo=",
+        "owner": "burmudar",
+        "repo": "nix-cloudflare-caddy",
+        "rev": "a09f7f8ba4d26fb70858729abca41e60163bcd7e",
         "type": "github"
       },
       "original": {
-        "owner": "ajaxbits",
-        "repo": "nixos-caddy-patched",
+        "owner": "burmudar",
+        "repo": "nix-cloudflare-caddy",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index b89d584..9407b44 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
 
     # custom pkgs
     caddy = {
-      url = "github:ajaxbits/nixos-caddy-patched";
+      url = "github:burmudar/nix-cloudflare-caddy";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -60,9 +60,7 @@
         pkgs = import nixpkgs {
           inherit system;
           overlays = [
-            (_self: super: {
-              caddy-patched = caddy.packages.${system}.caddy;
-            })
+            caddy.overlay
           ];
         };
         pkgsUnfree = unfree.legacyPackages.${system};