refactor(flake): inline assembly wiring
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
{
|
||||
inputs,
|
||||
lib,
|
||||
root,
|
||||
specialArgs,
|
||||
repositoryModules,
|
||||
registryAssembly,
|
||||
registry,
|
||||
util,
|
||||
}:
|
||||
let
|
||||
@@ -65,7 +66,7 @@ let
|
||||
enable = lib.mkEnableOption "a reverse-proxy route for this guest";
|
||||
|
||||
route = lib.mkOption {
|
||||
type = registryAssembly.definitions.route.type;
|
||||
type = registry.types.route;
|
||||
description = "Route registry entry published for this guest.";
|
||||
};
|
||||
};
|
||||
@@ -247,7 +248,7 @@ let
|
||||
inputs.stylix.nixosModules.stylix
|
||||
|
||||
repositoryModules
|
||||
registryAssembly.module
|
||||
registry.module
|
||||
cfg.interior
|
||||
|
||||
{
|
||||
@@ -268,15 +269,11 @@ let
|
||||
};
|
||||
};
|
||||
in
|
||||
let
|
||||
files = util.collectNixFiles root;
|
||||
guestFiles = lib.filterAttrs (file: type: type == "regular" && lib.hasSuffix ".nix" file) (builtins.readDir root);
|
||||
names = map (file: lib.removeSuffix ".nix" file) (lib.attrNames guestFiles);
|
||||
in
|
||||
{
|
||||
mkGuests =
|
||||
{ root }:
|
||||
let
|
||||
files = util.collectNixFiles root;
|
||||
guestFiles = lib.filterAttrs (file: type: type == "regular" && lib.hasSuffix ".nix" file) (builtins.readDir root);
|
||||
names = map (file: lib.removeSuffix ".nix" file) (lib.attrNames guestFiles);
|
||||
in
|
||||
{
|
||||
imports = files ++ map mkGuest names;
|
||||
};
|
||||
imports = files ++ map mkGuest names;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user