Add missing user-vms ssh_public_key option

acmcsufoss · May 3, 2024 · 1da4220 · 1da4220
1 parent ba2930c
commit 1da4220
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/user-machines/vm/default.nix b/user-machines/vm/default.nix
@@ -79,6 +79,11 @@ in
 							type = types.str;
 							description = "The default password for the user.";
 						};
+						ssh_public_key = mkOption {
+							type = types.nullOr types.str;
+							default = null;
+							description = "The SSH public key for the user.";
+						};
 						uuid = mkOption {
 							type = types.str;
 							description = "The UUID of the user.";

diff --git a/user-machines/vm/ubuntu-cloud-init.nix b/user-machines/vm/ubuntu-cloud-init.nix
@@ -42,7 +42,7 @@ let
 							lock_passwd = false;
 							plain_text_passwd = user.default_password;
 						} //
-						(lib.optionalAttrs (user ? "ssh_public_key" && user.ssh_public_key != null) {
+						(lib.optionalAttrs (user.ssh_public_key != null) {
 							ssh_authorized_keys = user.ssh_keys;
 						})
 					)