diff --git a/.gitignore b/.gitignore index 45b863ff..fed75a61 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/clanModules/sshd.nix b/clanModules/sshd.nix index 939fd327..0112a2ff 100644 --- a/clanModules/sshd.nix +++ b/clanModules/sshd.nix @@ -2,7 +2,7 @@ services.openssh.enable = true; services.openssh.hostKeys = [{ - path = builtins.storePath config.clanCore.secrets.openssh.secrets."ssh.id_ed25519".path; + path = config.clanCore.secrets.openssh.secrets."ssh.id_ed25519".path; type = "ed25519"; }]; 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 00000000..c305404c --- /dev/null +++ b/machines/test_backup_client/facts/borgbackup.ssh.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBIbwIVnLy+uoDZ6uK/OCc1QK46SIGeC3mVc85dqLYQw lass@ignavia diff --git a/nixosModules/clanCore/secrets/default.nix b/nixosModules/clanCore/secrets/default.nix index 395acdc7..18371359 100644 --- a/nixosModules/clanCore/secrets/default.nix +++ b/nixosModules/clanCore/secrets/default.nix @@ -143,11 +143,11 @@ default = fact.config._module.args.name; }; path = lib.mkOption { - type = lib.types.str; + type = lib.types.path; description = '' path to a fact which is generated by the generator ''; - default = "${config.clanCore.clanDir}/machines/${config.clanCore.machineName}/facts/${fact.config._module.args.name}"; + default = config.clanCore.clanDir + "/machines/${config.clanCore.machineName}/facts/${fact.config._module.args.name}"; }; value = lib.mkOption { defaultText = lib.literalExpression "\${config.clanCore.clanDir}/\${fact.config.path}"; diff --git a/pkgs/installer/flake-module.nix b/pkgs/installer/flake-module.nix index e9d8c875..8327591e 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;