chungus: we doin vfio again

ifd3f · Dec 13, 2024 · db7b623 · db7b623
1 parent 3f9f8b8
commit db7b623
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/machines/chungus/configuration.nix b/machines/chungus/configuration.nix
@@ -1,6 +1,19 @@
 inputs:
 { config, pkgs, lib, ... }:
-with lib; {
+let
+  mkGpu = { video, audio }: {
+    inherit video audio;
+    pciDevs = [ video audio ];
+  };
+  mainGpu = mkGpu {
+    video = "10de:2482";
+    audio = "10de:228b";
+  };
+  backupGpu = mkGpu {
+    video = "10de:1cb6";
+    audio = "10de:0fb9";
+  };
+in with lib; {
   imports = [
     ./hardware-configuration.nix
     "${inputs.nixos-hardware}/common/cpu/amd"
@@ -12,9 +25,9 @@ with lib; {
   astral.tailscale.oneOffKey =
     "tskey-auth-kCDetm2CNTRL-3bYunP5bKyUL7q7gdE9DxUHjinjQuZPZ";
   astral.vfio = {
-    enable = true;
+    enable = false;
     iommu-mode = "amd_iommu";
-    pci-devs = [ ];
+    pci-devs = mainGpu.pciDevs;
   };
 
   # so i can be a *gamer*
@@ -77,5 +90,10 @@ with lib; {
   hardware.nvidia.open = true;
 
   services.xserver.dpi = 224;
+
+  specialisation."VFIO".configuration = {
+    system.nixos.tags = [ "with-vfio" ];
+    astral.vfio.enable = mkForce true;
+  };
 }
 
diff --git a/nix/nixos-modules/astral/vfio.nix b/nix/nixos-modules/astral/vfio.nix
@@ -38,12 +38,6 @@
         "vfio_pci"
         "vfio"
         "vfio_iommu_type1"
-        #"vfio_virqfd"
-
-        #"nvidia"
-        #"nvidia_modeset"
-        #"nvidia_uvm"
-        #"nvidia_drm"
       ];
     };
   };