yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Format

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@@ -57,7 +57,9 @@
# 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 =
{ inputs', ... }:
{
packages.nixos-facter = inputs'.nixos-facter.packages.default; packages.nixos-facter = inputs'.nixos-facter.packages.default;
}; };
} }

8
lib/build-clan/module.nix
View File

@@ -81,7 +81,13 @@ 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
(builtins.all builtins.pathExists [
hwConfig
facterJson
])
[
'' ''
Duplicate hardware facts: '${hwConfig}' and '${facterJson}' exist. Duplicate hardware facts: '${hwConfig}' and '${facterJson}' exist.
Using both is not recommended. Using both is not recommended.

4
pkgs/webview-ui/app/src/routes/machines/[name]/view.tsx
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") {