fix passthroug module

modules/passthrough/default.nix

@@ -1,8 +1,3 @@
 {
-  # Add your NixOS modules here
+  imports = [ ./virtualisation.nix ./vfio.nix ];
-  #
-  # libvirt = ./libvirt.nix;
-  # vfio = ./vfio.nix;
-  # virtualisation.nix = ./virtualisation.nix;
-  imports = [ ./virtualisation.nix ./vfio.nix ./libvirt.nix ];
 }

modules/passthrough/libvirt.nix

@@ -1,37 +0,0 @@
-{ lib, pkgs, config, ... }:
-with lib;
-let
-  cfg = config.virtualisation.libvirtd;
-
-  boolToZeroOne = x: if x then "1" else "0";
-
-  aclString = with lib.strings;
-    concatMapStringsSep ''
-      ,
-        '' escapeNixString cfg.deviceACL;
-in {
-  options.virtualisation.libvirtd = {
-    deviceACL = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-    };
-    clearEmulationCapabilities = mkOption {
-      type = types.bool;
-      default = true;
-    };
-  };
-
-  config.users.users."qemu-libvirtd" = {
-    extraGroups = optionals (!cfg.qemu.runAsRoot) [ "kvm" "input" ];
-    isSystemUser = true;
-  };
-
-  config.virtualisation.libvirtd.qemu.verbatimConfig = ''
-    clear_emulation_capabilities = ${
-      boolToZeroOne cfg.clearEmulationCapabilities
-    }
-    cgroup_device_acl = [
-      ${aclString}
-    ]
-  '';
-}

modules/passthrough/vfio.nix

@@ -2,48 +2,55 @@
 with lib;
 let
   cfg = config.virtualisation.vfio;
-  acscommit = "1ec4cb0753488353e111496a90bdfbe2a074827e";
+  cfg-libvirtd = config.virtualisation.libvirtd;
+  boolToZeroOne = x: if x then "1" else "0";
+  aclString = with lib.strings;
+    concatMapStringsSep ''
+      ,
+        '' escapeNixString cfg.deviceACL;
 in {
-  options.virtualisation.vfio = {
+  options.virtualisation = {
-    enable = mkEnableOption "VFIO Configuration";
+    vfio = {
-    IOMMUType = mkOption {
+      enable = mkEnableOption "VFIO Configuration";
-      type = types.enum [ "intel" "amd" ];
+      IOMMUType = mkOption {
-      example = "intel";
+        type = types.enum [ "intel" "amd" ];
-      description = "Type of the IOMMU used";
+        example = "intel";
+        description = "Type of the IOMMU used";
+      };
+      devices = mkOption {
+        type = types.listOf (types.strMatching "[0-9a-f]{4}:[0-9a-f]{4}");
+        default = [ ];
+        example = [ "10de:1b80" "10de:10f0" ];
+        description = "PCI IDs of devices to bind to vfio-pci";
+      };
+      disableEFIfb = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = "Disables the usage of the EFI framebuffer on boot.";
+      };
+      blacklistNvidia = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Add Nvidia GPU modules to blacklist";
+      };
+      ignoreMSRs = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description =
+          "Enables or disables kvm guest access to model-specific registers";
+      };
     };
-    devices = mkOption {
+    libvirtd = {
-      type = types.listOf (types.strMatching "[0-9a-f]{4}:[0-9a-f]{4}");
+      deviceACL = mkOption {
-      default = [ ];
+        type = types.listOf types.str;
-      example = [ "10de:1b80" "10de:10f0" ];
+        default = [ ];
-      description = "PCI IDs of devices to bind to vfio-pci";
+      };
-    };
+      clearEmulationCapabilities = mkOption {
-    disableEFIfb = mkOption {
+        type = types.bool;
-      type = types.bool;
+        default = true;
-      default = false;
+      };
-      example = true;
-      description = "Disables the usage of the EFI framebuffer on boot.";
-    };
-    blacklistNvidia = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Add Nvidia GPU modules to blacklist";
-    };
-    ignoreMSRs = mkOption {
-      type = types.bool;
-      default = false;
-      example = true;
-      description =
-        "Enables or disables kvm guest access to model-specific registers";
-    };
-    applyACSpatch = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        If set, the following things will happen:
-          - The ACS override patch is applied
-          - Applies the i915-vga-arbiter patch
-          - Adds pcie_acs_override=downstream to the command line
-      '';
     };
   };
 
@@ -55,8 +62,8 @@ in {
     boot.kernelParams = (if cfg.IOMMUType == "intel" then [
       "intel_iommu=on"
       "intel_iommu=igfx_off"
-    ] else
+    ] else [ "amd_iommu=on" ])
-      [ "amd_iommu=on" ]) ++ (optional (builtins.length cfg.devices > 0)
+      ++ (optional (builtins.length cfg.devices > 0)
         ("vfio-pci.ids=" + builtins.concatStringsSep "," cfg.devices))
       ++ (optionals cfg.applyACSpatch [
         "pcie_acs_override=downstream,multifunction"
@@ -68,35 +75,21 @@ in {
       ]);
 
     boot.kernelModules = [ "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio" ];
-
     boot.initrd.kernelModules =
       [ "vfio_virqfd" "vfio_pci" "vfio_iommu_type1" "vfio" ];
     boot.blacklistedKernelModules =
       optionals cfg.blacklistNvidia [ "nvidia" "nouveau" ];
 
-    boot.kernelPatches = optionals cfg.applyACSpatch [
+    users.users."qemu-libvirtd" = {
-      {
+      extraGroups = optionals (!cfg-libvirtd.qemu.runAsRoot) [ "kvm" "input" ];
-        name = "add-acs-overrides";
+    };
-        patch = pkgs.fetchurl {
+    virtualisation.libvirtd.qemu.verbatimConfig = ''
-          name = "add-acs-overrides.patch";
+      clear_emulation_capabilities = ${
-          url =
+        boolToZeroOne cfg-libvirtd.clearEmulationCapabilities
-            "https://raw.githubusercontent.com/slowbro/linux-vfio/v5.5.4-arch1/add-acs-overrides.patch";
-          #url =
-          #  "https://aur.archlinux.org/cgit/aur.git/plain/add-acs-overrides.patch?h=linux-vfio&id=${acscommit}";
-          sha256 = "0nbmc5bwv7pl84l1mfhacvyp8vnzwhar0ahqgckvmzlhgf1n1bii";
-        };
       }
-      {
+      cgroup_device_acl = [
-        name = "i915-vga-arbiter";
+        ${aclString}
-        patch = pkgs.fetchurl {
+      ]
-          name = "i915-vga-arbiter.patch";
+    '';
-          url =
-            "https://raw.githubusercontent.com/slowbro/linux-vfio/v5.5.4-arch1/i915-vga-arbiter.patch";
-          #url =
-          #  "https://aur.archlinux.org/cgit/aur.git/plain/i915-vga-arbiter.patch?h=linux-vfio&id=${acscommit}";
-          sha256 = "1m5nn9pfkf685g31y31ip70jv61sblvxgskqn8a0ca60mmr38krk";
-        };
-      }
-    ];
   };
 }