From 34a7a042a36b63eb6b900932b1e420e4b6014a57 Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 5 May 2024 11:35:18 -0400 Subject: simplify some things (#353) * flake: drop flake-parts * flake: add back flake-parts * flake: use flake module again for configurations --- ext/terranix/default.nix | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'ext/terranix/default.nix') diff --git a/ext/terranix/default.nix b/ext/terranix/default.nix index 93e73a6..c70d4d8 100644 --- a/ext/terranix/default.nix +++ b/ext/terranix/default.nix @@ -1,18 +1,25 @@ -{ - perSystem = {pkgs, ...}: { - terranix = { - package = pkgs.opentofu.withPlugins (plugins: [ +{inputs, ...}: { + perSystem = { + pkgs, + system, + ... + }: { + packages = { + opentofu = pkgs.opentofu.withPlugins (plugins: [ plugins.cloudflare plugins.tailscale ]); - modules = [ - ./cloudflare - ./tailscale - ./cloud.nix - ./vars.nix - ./versions.nix - ]; + terranix = inputs.terranix.lib.terranixConfiguration { + inherit system; + modules = [ + ./cloudflare + ./tailscale + ./cloud.nix + ./vars.nix + ./versions.nix + ]; + }; }; }; } -- cgit v1.2.3