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.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};