From 99ea2ffe1cad0687bd4051e10c6a6a2859a42db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 15 Mar 2024 14:06:50 +0000 Subject: [PATCH] fix evaluation of backup module --- .gitignore | 1 - machines/test_backup_client/facts/borgbackup.ssh.pub | 1 + pkgs/installer/flake-module.nix | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 machines/test_backup_client/facts/borgbackup.ssh.pub diff --git a/.gitignore b/.gitignore index 45b863ff6..fed75a618 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ example_clan result* /pkgs/clan-cli/clan_cli/nixpkgs /pkgs/clan-cli/clan_cli/webui/assets -/machines nixos.qcow2 **/*.glade~ diff --git a/machines/test_backup_client/facts/borgbackup.ssh.pub b/machines/test_backup_client/facts/borgbackup.ssh.pub new file mode 100644 index 000000000..c305404cd --- /dev/null +++ b/machines/test_backup_client/facts/borgbackup.ssh.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBIbwIVnLy+uoDZ6uK/OCc1QK46SIGeC3mVc85dqLYQw lass@ignavia diff --git a/pkgs/installer/flake-module.nix b/pkgs/installer/flake-module.nix index e9d8c8753..8327591e3 100644 --- a/pkgs/installer/flake-module.nix +++ b/pkgs/installer/flake-module.nix @@ -29,7 +29,7 @@ in flake.packages.x86_64-linux.install-iso = self.inputs.disko.lib.makeDiskImages { nixosConfig = installer; }; - flake.nixosConfigurations = clan.nixosConfigurations; + flake.nixosConfigurations = { inherit (clan.nixosConfigurations) installer; }; flake.clanInternals = clan.clanInternals; flake.apps.x86_64-linux.install-vm.program = installer.config.formats.vm.outPath; flake.apps.x86_64-linux.install-vm-nogui.program = installer.config.formats.vm-nogui.outPath;