christoph/flake-nixinator
1
Fork 0
Code Activity

AMD->Nvidia

Browse Source
This commit is contained in:
Christoph Urlacher
2023-10-15 11:57:06 +02:00
parent d7e86c90fb
commit fa8426cabf
7 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/default.nix
View File

@ -183,7 +183,7 @@ with mylib.networking; {
programs.hyprland = {
enable = true;
enableNvidiaPatches = false;
enableNvidiaPatches = true;
};
# XDG
@ -399,7 +399,7 @@ with mylib.networking; {
flatpak.enable = true; # Not quite the nix style but useful for bottles/proprietary stuff/steam/gaming
fstrim.enable = true; # SSD
fwupd.enable = true; # Device firmware (I don't think I have any supported devices)
locate.enable = true; # Periodically update index
# locate.enable = true; # Periodically update index
ntp.enable = true; # Clock sync
gvfs = { # Network shares
enable = true;

12
system/nixinator/default.nix
View File

@ -56,6 +56,14 @@
"asu9KtQoZ3iKwELsDTgjPEiFNcD1XtgGgy3O4CZFg2w="
"92.223.89.133"
);
wg0-kh-8 = (
mylib.networking.mkWireguardService
"wg0-kh-8"
"proton-kh-8.key"
"D4M0O60wCBf1nYWOmXRfK7IpgG7VBBwQLeWVFLIqFG4="
"188.215.235.82"
);
};
};
};
@ -71,7 +79,7 @@
layout = "us";
xkbVariant = "altgr-intl";
# videoDrivers = [ "nvidia" ]; # NVIDIA
videoDrivers = ["amdgpu"];
videoDrivers = [ "nvidia" ]; # NVIDIA
# videoDrivers = ["amdgpu"];
};
}

21
system/nixinator/hardware-configuration.nix
View File

@ -15,8 +15,8 @@
# Enable early Nvidia kernel modesetting
# https://wiki.archlinux.org/title/GDM#GDM_ignores_Wayland_and_uses_X.Org_by_default (not fixed by this)
# https://wiki.archlinux.org/title/Kernel_mode_setting#Early_KMS_start
# initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" ]; # NVIDIA
initrd.kernelModules = ["amdgpu"]; # Initrd modules are always loaded, e.g. when they are required to mount the rootfs
initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" ]; # NVIDIA
# initrd.kernelModules = ["amdgpu"]; # Initrd modules are always loaded, e.g. when they are required to mount the rootfs
# kernelModules = ["kvm-intel" "iwlwifi"];
kernelModules = ["kvm-amd"];
@ -63,7 +63,7 @@
# networking.wireless.iwd.enable = true;
# networking.networkmanager.wifi.backend = "iwd";
nixpkgs.config.allowUnfree = true;
# nixpkgs.config.allowUnfree = true;
hardware = {
# Use all redistributable firmware (i.e. nonfree)
@ -72,7 +72,12 @@
# cpu.intel.updateMicrocode = true;
cpu.amd.updateMicrocode = true;
# nvidia.modesetting.enable = true; # Not officially supported by NVidia but needed for wayland
nvidia = {
modesetting.enable = true; # Not officially supported by NVidia but needed for wayland
open = true;
nvidiaSettings = true;
};
# video.hidpi.enable = lib.mkDefault true; # No longer has any effect
opengl = {
enable = true;
@ -86,16 +91,16 @@
# amdvlk # RADV (mesa) and AMDVLK (amd) can be used simultaneously
# OpenCL
rocm-opencl-icd
rocm-opencl-runtime
# rocm-opencl-icd
# rocm-opencl-runtime
# rocm-runtime # Wiki doesn't mention this, but it exists...
# TODO: Disabled for the moment, because hardware acceleration crashes AMDGPU driver
# VAAPI/VDPAU: https://nixos.wiki/wiki/Accelerated_Video_Playback
vaapiVdpau # Taken from wiki
libvdpau-va-gl # Taken from wiki
libvdpau # NOTE: Don't know if needed/where it belongs...
libva # NOTE: Don't know if needed/where it belongs...
# libvdpau # NOTE: Don't know if needed/where it belongs...
# libva # NOTE: Don't know if needed/where it belongs...
];
};