enforce new flake schema. formatting.

modules/nixos/virtualisation/default.nix

@@ -58,16 +58,18 @@ in
         enable = mkDefault true;
         onBoot = mkDefault "ignore";
         onShutdown = mkDefault "shutdown";
-        qemu.runAsRoot = mkDefault false;
-        qemu.verbatimConfig = ''
-          clear_emulation_capabilities = ${boolToZeroOne cfg.libvirtd.clearEmulationCapabilities}
-        ''
-        + optionalString (cfg.libvirtd.deviceACL != [ ]) ''
-          cgroup_device_acl = [
-            ${aclString}
-          ]
-        '';
-        qemu.swtpm.enable = mkDefault true; # TPM 2.0
+        qemu = {
+          runAsRoot = mkDefault false;
+          verbatimConfig = ''
+            clear_emulation_capabilities = ${boolToZeroOne cfg.libvirtd.clearEmulationCapabilities}
+          ''
+          + optionalString (cfg.libvirtd.deviceACL != [ ]) ''
+            cgroup_device_acl = [
+              ${aclString}
+            ]
+          '';
+          swtpm.enable = mkDefault true; # TPM 2.0
+        };
       };
       spiceUSBRedirection.enable = mkDefault true;
     };

modules/nixos/virtualisation/iommu-groups.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 shopt -s nullglob
 for d in /sys/kernel/iommu_groups/*/devices/*; do
     n=${d#*/iommu_groups/*}; n=${n%%/*}

modules/nixos/virtualisation/kvmfr.nix

@@ -78,34 +78,32 @@ let
     };
   };
 
-  deviceType = (
-    types.submodule (
-      { config, options, ... }:
-      {
-        options = {
-          resolution = mkOption {
-            type = types.nullOr resolutionType;
-            default = null;
-            description = "Automatically calculate the minimum device size for a specific resolution. Overrides `size` if set.";
-          };
-
-          size = mkOption {
-            type = types.number;
-            description = "Size for the kvmfr device in megabytes.";
-          };
-
-          permissions = mkOption {
-            type = permissionsType;
-            default = { };
-            description = "Permissions of the kvmfr device.";
-          };
+  deviceType = types.submodule (
+    { config, options, ... }:
+    {
+      options = {
+        resolution = mkOption {
+          type = types.nullOr resolutionType;
+          default = null;
+          description = "Automatically calculate the minimum device size for a specific resolution. Overrides `size` if set.";
         };
 
-        config = {
-          size = mkIf (config.resolution != null) (sizeFromResolution config.resolution);
+        size = mkOption {
+          type = types.number;
+          description = "Size for the kvmfr device in megabytes.";
         };
-      }
-    )
+
+        permissions = mkOption {
+          type = permissionsType;
+          default = { };
+          description = "Permissions of the kvmfr device.";
+        };
+      };
+
+      config = {
+        size = mkIf (config.resolution != null) (sizeFromResolution config.resolution);
+      };
+    }
   );
 
   inherit (lib)
@@ -144,7 +142,7 @@ in
       '';
 
       "modprobe.d/kvmfr.conf".text = ''
-        options kvmfr static_size_mb=${concatStringsSep "," (map (size: toString size) deviceSizes)}
+        options kvmfr static_size_mb=${concatStringsSep "," (map toString deviceSizes)}
       '';
 
       "apparmor.d/local/abstractions/libvirt-qemu" = mkIf config.security.apparmor.enable {