From c4a1e3ec9523c5543884e9d2c2e0f82200b68c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 Jan 2025 19:04:35 +0100 Subject: [PATCH] switch to nixos-facter for hardware-config --- checks/installation/flake-module.nix | 4 ++-- docs/site/getting-started/configure.md | 3 ++- pkgs/clan-cli/clan_cli/machines/hardware.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/checks/installation/flake-module.nix b/checks/installation/flake-module.nix index f48c4e040..efa6c0a3b 100644 --- a/checks/installation/flake-module.nix +++ b/checks/installation/flake-module.nix @@ -126,9 +126,9 @@ client.succeed("cp -r ${../..} test-flake && chmod -R +w test-flake") client.fail("test -f test-flake/machines/test-install-machine/hardware-configuration.nix") client.succeed("clan machines update-hardware-config --flake test-flake test-install-machine root@installer >&2") - client.succeed("test -f test-flake/machines/test-install-machine/hardware-configuration.nix") - client.succeed("clan machines update-hardware-config --backend nixos-facter --flake test-flake test-install-machine root@installer>&2") client.succeed("test -f test-flake/machines/test-install-machine/facter.json") + client.succeed("clan machines update-hardware-config --backend nixos-generate-config --flake test-flake test-install-machine root@installer>&2") + client.succeed("test -f test-flake/machines/test-install-machine/hardware-configuration.nix") client.succeed("clan machines install --debug --flake ${../..} --yes test-install-machine --target-host root@installer >&2") try: installer.shutdown() diff --git a/docs/site/getting-started/configure.md b/docs/site/getting-started/configure.md index 218e1dc2f..3dc2e190d 100644 --- a/docs/site/getting-started/configure.md +++ b/docs/site/getting-started/configure.md @@ -163,7 +163,8 @@ replace `[MACHINE_NAME]` with the name of the machine i.e. `jon` and `[HOSTNAME] clan machines update-hardware-config jon ``` - This command connects to the ip configured in the previous step, runs `nixos-generate-config` to detect hardware configurations (excluding filesystems), and writes them to `machines/jon/hardware-configuration.nix`. + This command connects to the ip configured in the previous step, runs [nixos-facter](https://github.com/nix-community/nixos-facter) + to detect hardware configurations (excluding filesystems), and writes them to `machines/jon/facter.json`. ### Step 3: Custom Disk Formatting diff --git a/pkgs/clan-cli/clan_cli/machines/hardware.py b/pkgs/clan-cli/clan_cli/machines/hardware.py index 28c7b3c7c..e7b62431f 100644 --- a/pkgs/clan-cli/clan_cli/machines/hardware.py +++ b/pkgs/clan-cli/clan_cli/machines/hardware.py @@ -237,5 +237,5 @@ def register_update_hardware_config(parser: argparse.ArgumentParser) -> None: "--backend", help="The type of hardware report to generate.", choices=["nixos-generate-config", "nixos-facter"], - default="nixos-generate-config", + default="nixos-facter", )