README.md

@@ -6,7 +6,7 @@ WFVM
 A Nix library to create and manage virtual machines running Windows, a medieval operating system found on most computers in 2020. The F stands for "Functional" or a four-letter word of your choice.
 
 * Reproducible - everything runs in the Nix sandbox with no tricks.
-* Fully automatic, parameterizable Windows 11 installation.
+* Fully automatic, parameterizable Windows 10 installation.
 * Uses QEMU with KVM.
 * Supports incremental installation (using "layers") of additional software via QEMU copy-on-write backing chains. For example, ``wfvm.makeWindowsImage { installCommands = [ wfvm.layers.anaconda3 ]; };`` gives you a VM image with Anaconda3 installed, and ``wfvm.makeWindowsImage { installCommands = [ wfvm.layers.anaconda3 wfvm.layers.msys2 ]; };`` gives you one with both Anaconda3 and MSYS2 installed. The base Windows installation and the Anaconda3 data are shared between both images, and only the MSYS2 installation is performed when building the second image after the first one has been built.
 * Included layers: Anaconda3, a software installer chock full of bugs that pretends to be a package manager, Visual Studio, a spamming system for Microsoft accounts that includes a compiler, and MSYS2, which is the only sane component in the whole lot.

flake.lock

@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1685004253,
+        "lastModified": 1665449268,
-        "narHash": "sha256-AbVL1nN/TDicUQ5wXZ8xdLERxz/eJr7+o8lqkIOVuaE=",
+        "narHash": "sha256-cw4xrQIAZUyJGj58Dp5VLICI0rscd+uap83afiFzlcA=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3e01645c40b92d29f3ae76344a6d654986a91a91",
+        "rev": "285e77efe87df64105ec14b204de6636fb0a7a27",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,7 +2,7 @@
   description = "WFVM: Windows Functional Virtual Machine";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   };
 
   outputs = { self, nixpkgs }:
@@ -12,26 +12,13 @@
 
       pkgs = nixpkgs.legacyPackages.${system};
 
-    in rec {
+    in {
       lib = import ./wfvm {
         inherit pkgs;
       };
 
-      packages.${system} = rec {
+      packages.${system}.demoImage = import ./wfvm/demo-image.nix {
-        demoImage = import ./wfvm/demo-image.nix {
+        inherit self;
-          inherit self;
-        };
-
-        default = lib.utils.wfvm-run {
-          name = "demo";
-          image = demoImage;
-          script =
-            ''
-            echo "Windows booted. Press Enter to terminate VM."
-            read
-            '';
-          display = true;
-        };
       };
     };
 }

wfvm/autounattend.nix

@@ -14,7 +14,6 @@
 , services ? {}
 , impureShellCommands ? []
 , driveLetter ? "D:"
-, efi ? true
 , imageSelection ? "Windows 11 Pro N"
 , enableTpm
 , ...
@@ -120,8 +119,7 @@ let
   # Windows expects a flat list of users while we want to manage them as a set
   flatUsers = builtins.attrValues (builtins.mapAttrs (name: s: s // { inherit name; }) users);
 
-  diskId =
+  diskId = 2;
-    if efi then 2 else 1;
 
   autounattendXML = pkgs.writeText "autounattend.xml" ''
     <?xml version="1.0" encoding="utf-8"?>
@@ -161,12 +159,12 @@ let
               <CreatePartitions>
                 <CreatePartition wcm:action="add">
                   <Order>1</Order>
-                  <Type>${if efi then "EFI" else "Primary"}</Type>
+                  <Type>EFI</Type>
                   <Size>300</Size>
                 </CreatePartition>
                 <CreatePartition wcm:action="add">
                   <Order>2</Order>
-                  <Type>${if efi then "MSR" else "Primary"}</Type>
+                  <Type>MSR</Type>
                   <Size>16</Size>
                 </CreatePartition>
                 <CreatePartition wcm:action="add">
@@ -178,7 +176,7 @@ let
               <ModifyPartitions>
                 <ModifyPartition wcm:action="add">
                   <Order>1</Order>
-                  <Format>${if efi then "FAT32" else "NTFS"}</Format>
+                  <Format>FAT32</Format>
                   <Label>System</Label>
                   <PartitionID>1</PartitionID>
                 </ModifyPartition>

wfvm/default.nix

@@ -2,6 +2,6 @@
 
 {
   makeWindowsImage = attrs: import ./win.nix ({ inherit pkgs; } // attrs);
-  layers = import ./layers { inherit pkgs; };
+  layers = (import ./layers { inherit pkgs; });
-  utils = import ./utils.nix { inherit pkgs; };
+  utils = (import ./utils.nix { inherit pkgs; });
 }

wfvm/demo-image.nix

@@ -57,7 +57,7 @@ wfvm.makeWindowsImage {
         disable-autolock
         disable-firewall
       ])
-      anaconda3 msys2
+      anaconda3 msys2 msvc msvc-ide-unbreak
     ];
 
   # services = {

wfvm/utils.nix

@@ -2,9 +2,7 @@
 , baseRtc ? "2022-10-10T10:10:10"
 , cores ? "4"
 , qemuMem ? "4G"
-, efi ? true
 , enableTpm ? false
-, ...
 }:
 
 rec {
@@ -25,7 +23,6 @@ rec {
     "-rtc base=${baseRtc}"
     "-device qemu-xhci"
     "-device virtio-net-pci,netdev=n1"
-  ] ++ pkgs.lib.optionals efi [
     "-bios ${OVMF.fd}/FV/OVMF.fd"
   ] ++ pkgs.lib.optionals enableTpm [
     "-chardev" "socket,id=chrtpm,path=tpm.sock"

wfvm/win.nix

@@ -8,13 +8,12 @@
 , enableTpm ? true
 # autounattend always installs index 1, so this default is backward-compatible
 , imageSelection ? "Windows 11 Pro N"
-, efi ? true
 , ...
 }@attrs:
 
 let
   lib = pkgs.lib;
-  utils = import ./utils.nix ({ inherit pkgs efi enableTpm; } // attrs);
+  utils = import ./utils.nix { inherit pkgs enableTpm; };
   inherit (pkgs) guestfs-tools;
 
   # p7zip on >20.03 has known vulns but we have no better option
@@ -96,7 +95,7 @@ let
         "usb-storage,drive=virtio-win"
         # USB boot
         "-drive"
-        "id=win-install,file=${if efi then "usb" else "cd"}image.img,if=none,format=raw,readonly=on,media=${if efi then "disk" else "cdrom"}"
+        "id=win-install,file=usbimage.img,if=none,format=raw,readonly=on,media=disk"
         "-device"
         "usb-storage,drive=win-install"
         # Output image
@@ -125,11 +124,7 @@ let
 
         cp ${autounattend.autounattendXML} win/autounattend.xml
 
-        ${if efi then ''
         virt-make-fs --partition --type=fat win/ usbimage.img
-        '' else ''
-        ${pkgs.cdrkit}/bin/mkisofs -iso-level 4 -l -R -udf -D -b boot/etfsboot.com -no-emul-boot -boot-load-size 8 -hide boot.catalog -eltorito-alt-boot -o cdimage.img win/
-        ''}
         rm -rf win
 
         ${utils.tpmStartCommands}