This commit is contained in:
Johannes Kirschbauer
2024-08-23 18:04:20 +02:00
parent 1e63e0b1a9
commit c43599bfa0
3 changed files with 20 additions and 12 deletions

View File

@@ -57,9 +57,11 @@
# Inherit the nixos-facter package so its build is chached in clans binary cache # Inherit the nixos-facter package so its build is chached in clans binary cache
{ {
perSystem = {system, inputs', ...}: { perSystem =
packages.nixos-facter = inputs'.nixos-facter.packages.default; { inputs', ... }:
}; {
packages.nixos-facter = inputs'.nixos-facter.packages.default;
};
} }
]; ];
} }

View File

@@ -81,14 +81,20 @@ let
"${directory}/machines/${name}/configuration.nix" "${directory}/machines/${name}/configuration.nix"
hwConfig hwConfig
]; ];
config.warnings = lib.optionals (builtins.all builtins.pathExists [hwConfig facterJson]) [ config.warnings =
'' lib.optionals
Duplicate hardware facts: '${hwConfig}' and '${facterJson}' exist. (builtins.all builtins.pathExists [
Using both is not recommended. hwConfig
facterJson
])
[
''
Duplicate hardware facts: '${hwConfig}' and '${facterJson}' exist.
Using both is not recommended.
It is recommended to use the hardware facts from '${facterJson}', please remove '${hwConfig}'. It is recommended to use the hardware facts from '${facterJson}', please remove '${hwConfig}'.
'' ''
]; ];
} }
settings settings
clan-core.nixosModules.clanCore clan-core.nixosModules.clanCore

View File

@@ -94,7 +94,7 @@ const InstallMachine = (props: InstallMachineProps) => {
} }
const loading_toast = toast.loading( const loading_toast = toast.loading(
"Installing machine. Grab coffee (15min)..." "Installing machine. Grab coffee (15min)...",
); );
const r = await callApi("install_machine", { const r = await callApi("install_machine", {
opts: { opts: {
@@ -371,7 +371,7 @@ const MachineForm = (props: MachineDetailsProps) => {
}); });
if (machine_response.status === "error") { if (machine_response.status === "error") {
toast.error( toast.error(
`Failed to set machine: ${machine_response.errors[0].message}` `Failed to set machine: ${machine_response.errors[0].message}`,
); );
} }
if (machine_response.status === "success") { if (machine_response.status === "success") {