chore: run nix fmt

This commit is contained in:
UGA Innovation Factory
2026-01-07 18:15:37 -05:00
parent 4cb8d8ef13
commit d89caa8a6b
8 changed files with 69 additions and 61 deletions

View File

@@ -22,7 +22,11 @@ let
inventoryModule = lib.evalModules { inventoryModule = lib.evalModules {
modules = [ modules = [
(import ./fleet-option.nix { inherit inputs; }) (import ./fleet-option.nix { inherit inputs; })
{ _module.args = { pkgs = nixpkgs.legacyPackages.x86_64-linux; }; } {
_module.args = {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
};
}
(lib.mkIf (fleet != null) { athenix.fleet = lib.mkForce fleet; }) (lib.mkIf (fleet != null) { athenix.fleet = lib.mkForce fleet; })
(lib.mkIf (hwTypes != null) { athenix.hwTypes = lib.mkForce hwTypes; }) (lib.mkIf (hwTypes != null) { athenix.hwTypes = lib.mkForce hwTypes; })
]; ];

View File

@@ -8,12 +8,16 @@
let let
fleetDefinition = lib.mkOption { fleetDefinition = lib.mkOption {
description = "Hardware types definitions for the fleet."; description = "Hardware types definitions for the fleet.";
type = lib.types.attrsOf (lib.types.submodule ({ name, ...}: { type = lib.types.attrsOf (
lib.types.submodule (
{ name, ... }:
{
options = { options = {
type = lib.mkOption { type = lib.mkOption {
type = lib.types.oneOf [ type = lib.types.oneOf [
lib.types.str lib.types.str
lib.types.listOf lib.types.str lib.types.listOf
lib.types.str
]; ];
default = name; default = name;
description = "Type(s) of system configuration for this device."; description = "Type(s) of system configuration for this device.";
@@ -26,10 +30,13 @@ let
devices = lib.mkOption { devices = lib.mkOption {
type = lib.types.oneOf [ type = lib.types.oneOf [
lib.types.int lib.types.int
(lib.types.attrsOf (lib.types.attrsOf (
(lib.types.submodule ({ name, ... }: { lib.types.submodule (
{ name, ... }:
{
freeformType = lib.types.attrs; freeformType = lib.types.attrs;
}) }
)
)) ))
]; ];
}; };
@@ -49,7 +56,9 @@ let
description = "Overrides to apply to all devices of this type."; description = "Overrides to apply to all devices of this type.";
}; };
}; };
})); }
)
);
}; };
in in
{ {

View File

@@ -14,15 +14,10 @@ let
# Keep only regular *.nix files except default.nix # Keep only regular *.nix files except default.nix
nixFiles = filterAttrs ( nixFiles = filterAttrs (
name: type: name: type: type == "regular" && lib.hasSuffix ".nix" name && name != "default.nix"
type == "regular"
&& lib.hasSuffix ".nix" name
&& name != "default.nix"
) files; ) files;
moduleNames = map (name: removeSuffix ".nix" name) (attrNames nixFiles); moduleNames = map (name: removeSuffix ".nix" name) (attrNames nixFiles);
in in
# Export: { name = <module function from ./name.nix>; } # Export: { name = <module function from ./name.nix>; }
genAttrs moduleNames (name: genAttrs moduleNames (name: import (./. + ("/" + name + ".nix")))
import (./. + ("/" + name + ".nix"))
)

View File

@@ -5,7 +5,7 @@
fleet ? null, fleet ? null,
hwTypes ? null, hwTypes ? null,
}: }:
import ../fleet/default.nix { import ../fleet/default.nix {
inherit inputs; inherit inputs;
inherit fleet hwTypes; inherit fleet hwTypes;
} }