From 4de5af6fb68839e42c8d22478b7a71e53d32267b Mon Sep 17 00:00:00 2001
From: Jacob Herbst <jacob@1362.dk>
Date: Tue, 11 Feb 2025 17:17:19 +0100
Subject: [PATCH] vmware: baseImageSize -> virtualisation.diskSize

Rename vmware.baseImageSize to virtualisation.diskSize

Also fix wrongly named module option from commit: b0b3a75
---
 nixos/modules/virtualisation/vmware-image.nix | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/virtualisation/vmware-image.nix b/nixos/modules/virtualisation/vmware-image.nix
index 6eebc6910ff0..19b4105edba2 100644
--- a/nixos/modules/virtualisation/vmware-image.nix
+++ b/nixos/modules/virtualisation/vmware-image.nix
@@ -23,7 +23,6 @@ in
     (lib.mkRenamedOptionModuleWith {
       sinceRelease = 2505;
       from = [
-        "virtualisation"
         "vmware"
         "vmFileName"
       ];
@@ -32,19 +31,21 @@ in
         "fileName"
       ];
     })
-
+    (lib.modules.mkRenamedOptionModuleWith {
+      sinceRelease = 2605;
+      from = [
+        "vmware"
+        "baseImageSize"
+      ];
+      to = [
+        "virtualisation"
+        "diskSize"
+      ];
+    })
   ];
 
   options = {
     vmware = {
-      baseImageSize = lib.mkOption {
-        type = with lib.types; either (enum [ "auto" ]) int;
-        default = "auto";
-        example = 2048;
-        description = ''
-          The size of the VMWare base image in MiB.
-        '';
-      };
       vmDerivationName = lib.mkOption {
         type = lib.types.str;
         default = "nixos-vmware-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
@@ -78,7 +79,7 @@ in
         rm $diskImage
       '';
       format = "raw";
-      diskSize = cfg.baseImageSize;
+      diskSize = config.virtualisation.diskSize;
       partitionTableType = "efi";
       inherit config lib pkgs;
     };