refactor(flake): pass assembly namespace to modules

This commit is contained in:
2026-08-28 11:09:13 -04:00
parent 3f24669f78
commit 64d22473c3
11 changed files with 35 additions and 36 deletions

View File

@@ -6,7 +6,7 @@
let
registryAssembly = import ./registry.nix { inherit lib self; };
modules = import ./modules.nix { inherit lib; };
dotfilesLib = import ../lib { inherit lib; };
flakeLib = import ../lib { inherit lib; };
moduleFiles = modules.mkModules (self + "/modules");
guestFiles = modules.mkModules (self + "/guests");
@@ -15,17 +15,18 @@ let
specialArgs = {
inherit
dotfiles
flake
inputs
self
;
registry = collectedRegistry;
};
dotfiles = {
flake = {
inherit (hosts) mkHosts;
inherit (guests) mkGuest;
lib = dotfilesLib;
lib = flakeLib;
};
guests = import ./guests.nix {
@@ -36,7 +37,7 @@ let
specialArgs
moduleFiles
registryAssembly
dotfilesLib
flakeLib
;
};
@@ -52,6 +53,4 @@ let
;
};
in
{
inherit (hosts) mkHosts;
}
flake

View File

@@ -5,7 +5,7 @@
specialArgs,
moduleFiles,
registryAssembly,
dotfilesLib,
flakeLib,
}:
let
mkGuest =
@@ -103,7 +103,7 @@ let
};
mac = lib.mkOption {
type = lib.types.str;
default = dotfilesLib.deriveMac name;
default = flakeLib.deriveMac name;
defaultText = lib.literalMD "a stable address derived from the guest's namespace path";
example = "bc:24:11:00:00:01";
description = ''
@@ -306,7 +306,7 @@ let
}
(lib.mkIf networked (
let
bridgeDevice = "sys-subsystem-net-devices-${lib.replaceStrings [ "-" ] [ "\\x2d" ] (dotfilesLib.bridgeName cfg.vlan)}.device";
bridgeDevice = "sys-subsystem-net-devices-${lib.replaceStrings [ "-" ] [ "\\x2d" ] (flakeLib.bridgeName cfg.vlan)}.device";
in
{
after = [ bridgeDevice ];
@@ -319,7 +319,7 @@ let
containers.${machineName} = lib.mkIf (cfg.backend == "container") {
autoStart = cfg.autoStart;
privateNetwork = lib.mkDefault true;
hostBridge = lib.mkIf networked (dotfilesLib.bridgeName cfg.vlan);
hostBridge = lib.mkIf networked (flakeLib.bridgeName cfg.vlan);
privateUsers = lib.mkDefault "no";
additionalCapabilities = lib.optionals cfg.nesting [ "CAP_NET_ADMIN" ];
allowedDevices = lib.optionals cfg.nesting [