From 1903e0a6e13a455e68cbcc4b84c4c1a0f3ef32ad Mon Sep 17 00:00:00 2001
From: pazpi <pasettodavide@gmail.com>
Date: Fri, 6 Sep 2024 07:56:26 +0200
Subject: [PATCH] Prova soluzione 1 caddy. intero pkgs con caddy configurabile

---
 flake.lock                | 19 ++++++++++++++++++-
 flake.nix                 |  5 +++++
 hosts/default.nix         | 23 +++++++++++++++--------
 hosts/metrics/default.nix | 10 +++++-----
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index d0801c1..c74ebff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -241,6 +241,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-caddy": {
+      "locked": {
+        "lastModified": 1699107987,
+        "narHash": "sha256-nWXETr4Oqy/vOfzgWyMY04qzEN2iREFJc5ycQ3XNu0A=",
+        "owner": "jpds",
+        "repo": "nixpkgs",
+        "rev": "a33b02fa9d664f31dadc8a874eb1a5dbaa9f4ecf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jpds",
+        "ref": "caddy-external-plugins",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -248,7 +264,8 @@
         "home-manager": "home-manager_2",
         "lix-module": "lix-module",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-caddy": "nixpkgs-caddy"
       }
     },
     "stable": {
diff --git a/flake.nix b/flake.nix
index e0e18df..fa97b52 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,10 @@
       url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # Used for caddy plugins
+    nixpkgs-caddy.url = "github:jpds/nixpkgs/caddy-external-plugins";
+
   };
 
   outputs =
@@ -48,6 +52,7 @@
       system = "x86_64-linux";
       pkgs = import nixpkgs { inherit system; };
       lib = nixpkgs.lib;
+      caddyWithPlugins = pkgs.callPackage ./packages/caddy-pkg.nix { };
     in
     {
 
diff --git a/hosts/default.nix b/hosts/default.nix
index 3e864e9..21ff683 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,10 +1,10 @@
-{
-  nixpkgs,
-  nixos-hardware,
-  agenix,
-  home-manager,
-  lix-module,
-  ...
+{ nixpkgs
+, nixos-hardware
+, agenix
+, home-manager
+, lix-module
+, nixpkgs-caddy
+, ...
 }:
 let
   agenixOverlay = final: prev: { agenix = agenix.packages.${prev.system}.default; };
@@ -17,6 +17,13 @@ let
       config.allowUnfree = true;
     };
 
+  pkgs-caddy =
+    system:
+    import nixpkgs-caddy {
+      inherit system;
+      config.allowUnfree = true;
+    };
+
   myModule = {
     imports = [
       lix-module.nixosModules.default
@@ -68,7 +75,7 @@ in
       agenix.nixosModules.default
     ];
     specialArgs = {
-      # inherit nixvim nix-index-database;
+      pkgs-caddy = pkgs-caddy "x86_64-linux";
     };
   };
 
diff --git a/hosts/metrics/default.nix b/hosts/metrics/default.nix
index c094e78..1a7875b 100644
--- a/hosts/metrics/default.nix
+++ b/hosts/metrics/default.nix
@@ -1,8 +1,8 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
+{ config
+, pkgs
+, lib
+, pkgs-caddy
+, ...
 }:
 {