Prova soluzione 1 caddy. intero pkgs con caddy configurabile

This commit is contained in:
pazpi 2024-09-06 07:56:26 +02:00
parent b297bf2853
commit 1903e0a6e1
4 changed files with 43 additions and 14 deletions

19
flake.lock generated
View file

@ -241,6 +241,22 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@ -248,7 +264,8 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"lix-module": "lix-module", "lix-module": "lix-module",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"nixpkgs-caddy": "nixpkgs-caddy"
} }
}, },
"stable": { "stable": {

View file

@ -32,6 +32,10 @@
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Used for caddy plugins
nixpkgs-caddy.url = "github:jpds/nixpkgs/caddy-external-plugins";
}; };
outputs = outputs =
@ -48,6 +52,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
lib = nixpkgs.lib; lib = nixpkgs.lib;
caddyWithPlugins = pkgs.callPackage ./packages/caddy-pkg.nix { };
in in
{ {

View file

@ -1,10 +1,10 @@
{ { nixpkgs
nixpkgs, , nixos-hardware
nixos-hardware, , agenix
agenix, , home-manager
home-manager, , lix-module
lix-module, , nixpkgs-caddy
... , ...
}: }:
let let
agenixOverlay = final: prev: { agenix = agenix.packages.${prev.system}.default; }; agenixOverlay = final: prev: { agenix = agenix.packages.${prev.system}.default; };
@ -17,6 +17,13 @@ let
config.allowUnfree = true; config.allowUnfree = true;
}; };
pkgs-caddy =
system:
import nixpkgs-caddy {
inherit system;
config.allowUnfree = true;
};
myModule = { myModule = {
imports = [ imports = [
lix-module.nixosModules.default lix-module.nixosModules.default
@ -68,7 +75,7 @@ in
agenix.nixosModules.default agenix.nixosModules.default
]; ];
specialArgs = { specialArgs = {
# inherit nixvim nix-index-database; pkgs-caddy = pkgs-caddy "x86_64-linux";
}; };
}; };

View file

@ -1,8 +1,8 @@
{ { config
config, , pkgs
pkgs, , lib
lib, , pkgs-caddy
... , ...
}: }:
{ {