+4 -4

lib/caddy.nix

reviewed

··· 1 1 - { lib, self, ... }: 1 1 + { data, lib, ... }: 2 2 let 3 3 4 4 - pns = self.lib.data.services; 5 5 - marvinIP = self.lib.data.hosts.marvin.ts.ip4; 4 4 + pns = data.services; 5 5 + marvinIP = data.hosts.marvin.ts.ip4; 6 6 marvin = "http://${marvinIP}"; 7 7 - inherit (self.lib.data) tsNet; 7 7 + inherit (data) tsNet; 8 8 9 9 in 10 10 rec {

+7 -3

lib/default.nix

reviewed

··· 1 1 - _: { 1 1 + { lib, ... }: 2 2 + let 3 3 + data = import ./data; 4 4 + in 5 5 + { 2 6 flake = { 3 7 lib = { 4 4 - caddy = import ./caddy.nix; 5 5 - data = import ./data; 8 8 + caddy = import ./caddy.nix { inherit data lib; }; 9 9 + inherit data; 6 10 }; 7 11 }; 8 12 }