diff options
| -rw-r--r-- | ext/openwrt/default.nix | 2 | ||||
| -rw-r--r-- | ext/terranix/default.nix | 4 | ||||
| -rw-r--r-- | modules/flake/terranix.nix | 11 |
3 files changed, 4 insertions, 13 deletions
diff --git a/ext/openwrt/default.nix b/ext/openwrt/default.nix index 16f0fb9..dd163df 100644 --- a/ext/openwrt/default.nix +++ b/ext/openwrt/default.nix @@ -5,7 +5,7 @@ }: { flake.legacyPackages.x86_64-linux = withSystem "x86_64-linux" ({pkgs, ...}: { openWrtImages = { - turret = pkgs.callPackage ./systems/turret { + turret = pkgs.callPackage ./turret { inherit (inputs) openwrt-imagebuilder; }; }; diff --git a/ext/terranix/default.nix b/ext/terranix/default.nix index b27e23d..93e73a6 100644 --- a/ext/terranix/default.nix +++ b/ext/terranix/default.nix @@ -1,8 +1,6 @@ -{inputs, ...}: { +{ perSystem = {pkgs, ...}: { terranix = { - builder = inputs.terranix.lib.terranixConfiguration; - package = pkgs.opentofu.withPlugins (plugins: [ plugins.cloudflare plugins.tailscale diff --git a/modules/flake/terranix.nix b/modules/flake/terranix.nix index 66f79b9..294ee2b 100644 --- a/modules/flake/terranix.nix +++ b/modules/flake/terranix.nix @@ -1,6 +1,7 @@ { lib, flake-parts-lib, + inputs, ... }: let namespace = "terranix"; @@ -30,14 +31,6 @@ in { cfg = config.${namespace}; in { options.${namespace} = { - builder = mkOption { - type = types.functionTo (types.lazyAttrsOf types.raw); - example = literalExpression "inputs.terranix.lib.terranixConfiguration"; - description = mdDoc '' - Function used to build this terranixConfiguration - ''; - }; - modules = mkOption { type = types.listOf types.unspecified; default = []; @@ -62,7 +55,7 @@ in { }; config = { - terranix.configuration = cfg.builder { + terranix.configuration = inputs.terranix.lib.terranixConfiguration { inherit system; inherit (cfg) modules; }; |