infra/common/proxmox-qemu-vm.nix

@@ -1,13 +1,9 @@
-let
-  # pulling this in manually over from module args resolves an infinite recursion
-  sources = import ../../npins;
-in
+{ modulesPath, ... }:
+
 {
   _class = "nixos";
 
-  imports = [
-    "${sources.nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
-  ];
+  imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
   boot = {
     initrd = {

infra/flake-part.nix

@@ -33,10 +33,6 @@ let
           ;
       };
 
-      nixos.module.imports = [
-        ./common/proxmox-qemu-vm.nix
-      ];
-
       imports =
         [
           ./common/resource.nix
@@ -44,6 +40,7 @@ let
         ++ (
           if isTestVm then
             [
+              ./common/proxmox-qemu-vm.nix
               ../machines/operator/${vmName}
               {
                 nixos.module.users.users.root.openssh.authorizedKeys.keys = [

machines/dev/forgejo-ci/default.nix

@@ -48,7 +48,7 @@ in
       };
 
       ## NOTE: This is a physical machine, so is not covered by disko
-      fileSystems."/" = lib.mkForce {
+      fileSystems."/" = {
         device = "rpool/root";
         fsType = "zfs";
       };
@@ -58,7 +58,7 @@ in
         fsType = "zfs";
       };
 
-      fileSystems."/boot" = lib.mkForce {
+      fileSystems."/boot" = {
         device = "/dev/disk/by-uuid/50B2-DD3F";
         fsType = "vfat";
         options = [