diff --git a/deployment/check/common/utils.nix b/deployment/check/common/utils.nix index 5163a1c8..ba27c050 100644 --- a/deployment/check/common/utils.nix +++ b/deployment/check/common/utils.nix @@ -12,31 +12,14 @@ ../common/sharedOptions.nix ../common/targetNode.nix "${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix" - # systemd-repart - # ../../../infra/common/nixos/repart.nix - # disko - "${sources.disko}/module.nix" - ../../../infra/common/proxmox-qemu-vm.nix ]; - services.qemuGuest.enable = true; - services.openssh.enable = true; - services.cloud-init = { - enable = true; - network.enable = true; - }; - users.users = - { - root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFZsldWMEsajYysjYsEpNvMOjO4D8L21pTrfQS1T+Hfy" - ]; - } - // environment.config.resources."operator-environment".login-shell.apply { - resources = lib.filterAttrs (_name: value: value ? login-shell) ( - lib.concatMapAttrs ( - k': req: lib.mapAttrs' (k: lib.nameValuePair "${k'}.${k}") req.resources - ) requests - ); - }; + users.users = environment.config.resources."operator-environment".login-shell.apply { + resources = lib.filterAttrs (_name: value: value ? login-shell) ( + lib.concatMapAttrs ( + k': req: lib.mapAttrs' (k: lib.nameValuePair "${k'}.${k}") req.resources + ) requests + ); + }; }; } diff --git a/deployment/check/data-model-tf-proxmox/setups/shared.nix b/deployment/check/data-model-tf-proxmox/setups/shared.nix new file mode 100644 index 00000000..83e08156 --- /dev/null +++ b/deployment/check/data-model-tf-proxmox/setups/shared.nix @@ -0,0 +1,22 @@ +{ + sources ? import ../../../../npins, + ... +}: +{ + imports = [ + # systemd-repart + # ../../../../infra/common/nixos/repart.nix + # disko + "${sources.disko}/module.nix" + ../../../../infra/common/proxmox-qemu-vm.nix + ]; + services.qemuGuest.enable = true; + services.openssh.enable = true; + services.cloud-init = { + enable = true; + network.enable = true; + }; + users.users.root.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFZsldWMEsajYysjYsEpNvMOjO4D8L21pTrfQS1T+Hfy" + ]; +} diff --git a/deployment/check/data-model-tf-proxmox/setups/template.nix b/deployment/check/data-model-tf-proxmox/setups/template.nix index 78099441..d19d3a97 100644 --- a/deployment/check/data-model-tf-proxmox/setups/template.nix +++ b/deployment/check/data-model-tf-proxmox/setups/template.nix @@ -34,7 +34,12 @@ in }: { tf-proxmox-template = { - nixos-configuration = mkNixosConfiguration environment required-resources; + nixos-configuration = { + imports = [ + (mkNixosConfiguration environment required-resources) + ./shared.nix + ]; + }; system = targetSystem; ssh = { host = nodeName; diff --git a/deployment/check/data-model-tf-proxmox/setups/vm.nix b/deployment/check/data-model-tf-proxmox/setups/vm.nix index f93f05a0..df91b06d 100644 --- a/deployment/check/data-model-tf-proxmox/setups/vm.nix +++ b/deployment/check/data-model-tf-proxmox/setups/vm.nix @@ -46,7 +46,12 @@ in }: { tf-proxmox-vm = { - nixos-configuration = mkNixosConfiguration environment required-resources; + nixos-configuration = { + imports = [ + (mkNixosConfiguration environment required-resources) + ./shared.nix + ]; + }; system = targetSystem; ssh = { username = "root";