diff --git a/modules/k3s/deployments/default.nix b/modules/k3s/deployments/default.nix index 31da8c1..14c4702 100644 --- a/modules/k3s/deployments/default.nix +++ b/modules/k3s/deployments/default.nix @@ -1,8 +1,8 @@ { cfg, lib, inputs, ... }: let manifests = [ - "./ubuntu.nix" + ./ubuntu.nix ]; - imported = map ( n: import ${n} { inherit cfg lib inputs; } ) manifests; + imported = map ( n: import n { inherit cfg lib inputs; } ) manifests; in lib.foldl' lib.recursiveUpdate {} imported \ No newline at end of file diff --git a/modules/k3s/manifests.nix b/modules/k3s/manifests.nix index cc1b89e..ed5ec5a 100644 --- a/modules/k3s/manifests.nix +++ b/modules/k3s/manifests.nix @@ -1,9 +1,9 @@ -{ cfg, lib, ... }: +{ cfg, lib, inputs, ... }: let manifests = [ ./deployments ./services ]; - imported = map ( n: import ${n} { inherit cfg lib } ) manifests; + imported = map ( n: import n { inherit cfg lib inputs } ) manifests; in lib.foldl' lib.recursiveUpdate {} imported \ No newline at end of file diff --git a/modules/k3s/services/default.nix b/modules/k3s/services/default.nix index 3b0b5f9..62b0586 100644 --- a/modules/k3s/services/default.nix +++ b/modules/k3s/services/default.nix @@ -3,6 +3,6 @@ let manifests = [ "" ]; - imported = map ( n: import ${n} { inherit cfg lib inputs; } ) manifests; + imported = map ( n: import n { inherit cfg lib inputs; } ) manifests; in lib.foldl' lib.recursiveUpdate {} imported \ No newline at end of file