diff --git a/nixos/boxes/colony/vms/default.nix b/nixos/boxes/colony/vms/default.nix index 61fc632..e2c3685 100644 --- a/nixos/boxes/colony/vms/default.nix +++ b/nixos/boxes/colony/vms/default.nix @@ -46,9 +46,16 @@ ])); hostDevices."${wanBDF}" = { }; }; + shill = { uuid = "e34569ec-d24e-446b-aca8-a3b27abc1f9b"; + smp = { + cpus = 4; + threads = 2; + }; + memory = 8192; networks.vms.mac = "52:54:00:85:b3:b1"; + cleanShutdown.timeout = 120; drives = mkMerge ([ { installer = { diff --git a/nixos/modules/vms.nix b/nixos/modules/vms.nix index fbc1c4d..e8bf22b 100644 --- a/nixos/modules/vms.nix +++ b/nixos/modules/vms.nix @@ -147,7 +147,7 @@ let "uuid ${i.uuid}" "machine ${i.machine}" "cpu ${i.cpu}" - "smp cpus=${toString i.smp.cpus},threads=${toString i.smp.threads}" + "smp cores=${toString i.smp.cpus},threads=${toString i.smp.threads}" "m ${toString i.memory}" "nographic" "vga ${i.vga}"