AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change hardware conf

Browse Source
This commit is contained in:
Dmitriy Kholkin 2021-09-07 11:56:15 +03:00
parent a42b833da8
commit 596882c402
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/boot.nix
View File

@ -5,20 +5,10 @@
# efi.canTouchEfiVariables = true; # efi.canTouchEfiVariables = true;
}; };
# kernelPackages = if config.deviceSpecific.isVM then
# pkgs.linuxPackages
# else
# # pkgs.linuxPackages_latest;
# pkgs.linuxPackages; # FIXME
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
supportedFilesystems = [ "ntfs" ]; supportedFilesystems = [ "ntfs" ];
initrd.kernelModules = if config.deviceSpecific.devInfo.gpu.vendor == "intel" then
[ "i915" ]
else
[ ];
extraModprobeConfig = lib.mkIf (config.device == "AMD-Workstation") '' extraModprobeConfig = lib.mkIf (config.device == "AMD-Workstation") ''
options snd slots=snd_virtuoso,snd_usb_audio options snd slots=snd_virtuoso,snd_usb_audio
''; '';

12
modules/hardware.nix
View File

@ -15,18 +15,24 @@ with config.deviceSpecific; {
driSupport32Bit = true; driSupport32Bit = true;
extraPackages = if devInfo.gpu.vendor == "intel" then [ extraPackages = if devInfo.gpu.vendor == "intel" then [
pkgs.intel-media-driver pkgs.intel-media-driver
] else if devInfo.gpu.vendor == "intel" then [ ] else if devInfo.gpu.vendor == "amd" then [
pkgs.rocm-opencl-icd
pkgs.rocm-opencl-runtime
pkgs.amdvlk pkgs.amdvlk
] else [ ]; ] else [ ];
extraPackages32 = lib.mkIf (devInfo.gpu.vendor == "amd") [ extraPackages32 = lib.mkIf (devInfo.gpu.vendor == "amd") [
pkgs.driversi686Linux.amdvlk pkgs.driversi686Linux.amdvlk
]; ];
}; };
environment.sessionVariables = { environment.sessionVariables = lib.mkIf (devInfo.gpu.vendor == "intel") {
GST_VAAPI_ALL_DRIVERS = "1"; GST_VAAPI_ALL_DRIVERS = "1";
LIBVA_DRIVER_NAME = "iHD"; LIBVA_DRIVER_NAME = "iHD";
}; };
boot.initrd.kernelModules = lib.mkIf (devInfo.gpu.vendor == "amd") [ "amdgpu" ]; boot.initrd.kernelModules = if devInfo.gpu.vendor == "amd" then [
"amdgpu"
] else if devInfo.gpu.vendor == "intel" then [
i915
] else [ ];
# environment.systemPackages = if devInfo.gpu.vendor == "amd" then # environment.systemPackages = if devInfo.gpu.vendor == "amd" then
# # [ (pkgs.mesa.override { enableRadv = true; }) ] # # [ (pkgs.mesa.override { enableRadv = true; }) ]
# [ pkgs.mesa ] # [ pkgs.mesa ]