Enables iommu, splits out gpu related configs

This commit is contained in:
willemml 2024-02-14 14:39:10 -08:00
parent de6022d1c7
commit df0ac0a923
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
4 changed files with 31 additions and 23 deletions

View file

@ -9,6 +9,7 @@
}: {
imports = [
../profiles/desktop.nix
../profiles/nvidiagpu.nix
];
boot.initrd.availableKernelModules = ["vmd" "xhci_pci" "nvme" "ahci" "usbhid" "usb_storage" "sd_mod"];
@ -16,20 +17,11 @@
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
boot.kernelParams = ["iommu_intel=on"];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
hardware.opengl.driSupport = true;
hardware.opengl.enable = true;
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = false;
powerManagement.finegrained = false;
open = false;
nvidiaSettings = true;
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/4e9a4d87-4b00-413b-84c0-62e737a012a9";
fsType = "ext4";

View file

@ -6,29 +6,20 @@
}: {
imports = [
../profiles/desktop.nix
../profiles/amdgpu.nix
];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["amdgpu"];
boot.extraModulePackages = [];
boot.kernelParams = ["intel_iommu=on"];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.supportedFilesystems = ["zfs"];
boot.zfs.forceImportRoot = false;
networking.hostId = "06818aaa";
services.xserver.videoDrivers = ["amdgpu"];
hardware.opengl.driSupport = true;
hardware.opengl.enable = true;
hardware.opengl.extraPackages = with pkgs; [
amdvlk
];
fileSystems."/" = {
device = "/dev/disk/by-uuid/fe61bc5b-3b71-4819-8083-522f2c283252";
fsType = "ext4";

10
nixos/profiles/amdgpu.nix Normal file
View file

@ -0,0 +1,10 @@
{pkgs, ...}: {
boot.kernelModules = ["amdgpu"];
services.xserver.videoDrivers = ["amdgpu"];
hardware.opengl = {
driSupport = true;
enable = true;
extraPackages = [pkgs.amdvlk];
};
}

View file

@ -0,0 +1,15 @@
{...}: {
hardware.opengl = {
enable = true;
driSupport = true;
};
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = false;
powerManagement.finegrained = false;
# use closed source drivers
open = false;
nvidiaSettings = true;
};
}