summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--machines/x/configuration.nix2
-rw-r--r--modules/amdgpu.nix2
-rw-r--r--modules/nvidia.nix2
-rw-r--r--modules/passthrough.nix25
4 files changed, 6 insertions, 25 deletions
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
index a5bad12..33245d1 100644
--- a/machines/x/configuration.nix
+++ b/machines/x/configuration.nix
@@ -9,13 +9,13 @@
"amdgpu.nix"
"amd.nix"
"nvidia.nix"
- "passthrough.nix"
"core/audio.nix"
"core/bluetooth.nix"
"core/fonts.nix"
"compromyse.nix"
"login.nix"
"virtualization.nix"
+ "passthrough.nix"
]);
boot.loader.systemd-boot.enable = true;
diff --git a/modules/amdgpu.nix b/modules/amdgpu.nix
index 6c1f109..2426f2d 100644
--- a/modules/amdgpu.nix
+++ b/modules/amdgpu.nix
@@ -18,7 +18,7 @@
driversi686Linux.amdvlk
];
- services.xserver.videoDrivers = [ "modesetting" ];
+ services.xserver.videoDrivers = [ "modeset" ];
systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
diff --git a/modules/nvidia.nix b/modules/nvidia.nix
index 16966e0..5f49c8f 100644
--- a/modules/nvidia.nix
+++ b/modules/nvidia.nix
@@ -6,7 +6,7 @@
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
- powerManagement.finegrained = false;
+ powerManagement.finegrained = true;
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
diff --git a/modules/passthrough.nix b/modules/passthrough.nix
index 23afa88..ab68b8e 100644
--- a/modules/passthrough.nix
+++ b/modules/passthrough.nix
@@ -1,25 +1,6 @@
{ pkgs, lib, config, ... }:
-let
- # RTX 3070 Ti
- gpuIDs = [
- "10de:28e0" # Graphics
- "10de:22be" # Audio
- ];
-in {
- boot = {
- initrd.kernelModules = [
- "vfio_pci"
- "vfio"
- "vfio_iommu_type1"
-
- "nvidia"
- "nvidia_modeset"
- "nvidia_uvm"
- "nvidia_drm"
- ];
- kernelParams = [
- ("vfio-pci.ids=" + lib.concatStringsSep "," gpuIDs)
- ];
- };
+{
+ environment.systemPackages = with pkgs; [
+ ];
}