use amd's drm-next branch
This commit is contained in:
@@ -16,7 +16,7 @@ in {
|
||||
dedicatedServer.openFirewall =
|
||||
true; # Open ports in the firewall for Source Dedicated Server
|
||||
gamescopeSession.enable = true;
|
||||
extraCompatPackages = with pkgs; [ proton-ge-bin ];
|
||||
extraCompatPackages = with pkgs; [ proton-ge-bin steamtinkerlaunch ];
|
||||
};
|
||||
programs.gamemode = {
|
||||
enable = true;
|
||||
|
||||
@@ -12,9 +12,10 @@ in {
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services = {
|
||||
displayManager = {
|
||||
sddm.enable = true;
|
||||
sddm.theme = "${pkgs.sddm-astronaut}";
|
||||
displayManager.sddm = {
|
||||
enable = true;
|
||||
theme = "${pkgs.sddm-astronaut}";
|
||||
#wayland.enable = true;
|
||||
#sddm.theme = "breeze";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -6,31 +6,25 @@ in {
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
boot.kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" "split_lock_detect=off" ];
|
||||
boot.kernelParams =
|
||||
[ "amdgpu.ppfeaturemask=0xfff7ffff" "split_lock_detect=off" ];
|
||||
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
package = lib.mkForce pkgs.mesa-git.mesa.drivers;
|
||||
#extraPackages = with pkgs; [ mesa-git.amdvlk ];
|
||||
extraPackages = with pkgs; [ mesa-git.amdvlk ];
|
||||
};
|
||||
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
hardware.amdgpu.initrd.enable = lib.mkDefault true;
|
||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
||||
# controller (overclock, undervolt, fan curves)
|
||||
environment.systemPackages = with pkgs; [ lact nvtopPackages.amd ];
|
||||
environment.systemPackages = with pkgs; [
|
||||
lact
|
||||
nvtopPackages.amd
|
||||
amdgpu_top
|
||||
];
|
||||
systemd.packages = with pkgs; [ lact ];
|
||||
systemd.services.lactd.wantedBy = [ "multi-user.target" ];
|
||||
|
||||
hardware.firmware = with pkgs;
|
||||
[
|
||||
(linux-firmware.overrideAttrs (old: {
|
||||
src = builtins.fetchGit {
|
||||
url =
|
||||
"https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
|
||||
rev =
|
||||
"b4cb02b2dc3330c6e5d69e84a616b1ca5faecf12"; # Uncomment this line to allow for pure builds
|
||||
};
|
||||
}))
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,85 @@
|
||||
{pkgs, ...}:
|
||||
{
|
||||
{ pkgs, config, ... }:
|
||||
let
|
||||
#amdgpu_module_pkg =
|
||||
# { pkgs, lib, fetchurl, kernel ? pkgs.linuxPackages_latest.kernel, ... }:
|
||||
#
|
||||
# pkgs.stdenv.mkDerivation {
|
||||
# pname = "amdgpu-kernel-module";
|
||||
# inherit (kernel) version postPatch nativeBuildInputs;
|
||||
# src = fetchurl {
|
||||
# url =
|
||||
# "https://gitlab.freedesktop.org/agd5f/linux/-/archive/amd-drm-next-6.15-2025-03-14/linux-amd-drm-next-6.15-2025-03-14.tar.gz";
|
||||
# # After the first build attempt, look for "hash mismatch" and then 2 lines below at the "got:" line.
|
||||
# # Use "sha256-....." value here.
|
||||
# hash = "sha256-/9EvJNBSKteXljrZzmaQkbZ7o4etCe0yFM3JJg/jD7o=";
|
||||
# };
|
||||
#
|
||||
# kernel_dev = kernel.dev;
|
||||
# kernelVersion = kernel.modDirVersion;
|
||||
#
|
||||
# modulePath = "drivers/gpu/drm/amd/amdgpu";
|
||||
#
|
||||
# buildPhase = ''
|
||||
# BUILT_KERNEL=$kernel_dev/lib/modules/$kernelVersion/build
|
||||
#
|
||||
# cp $BUILT_KERNEL/Module.symvers .
|
||||
# cp $BUILT_KERNEL/.config .
|
||||
# cp $kernel_dev/vmlinux .
|
||||
#
|
||||
# make "-j$NIX_BUILD_CORES" modules_prepare
|
||||
# make "-j$NIX_BUILD_CORES" M=$modulePath modules
|
||||
# '';
|
||||
#
|
||||
# installPhase = ''
|
||||
# make \
|
||||
# INSTALL_MOD_PATH="$out" \
|
||||
# XZ="xz -T$NIX_BUILD_CORES" \
|
||||
# M="$modulePath" \
|
||||
# modules_install
|
||||
# '';
|
||||
#
|
||||
# meta = {
|
||||
# description = "AMD GPU kernel module";
|
||||
# license = lib.licenses.gpl3;
|
||||
# };
|
||||
# };
|
||||
# amdgpu_module = pkgs.callPackage amdgpu_module_pkg {
|
||||
# kernel = config.boot.kernelPackages.kernel;
|
||||
# };
|
||||
|
||||
in {
|
||||
#boot.extraModulePackages = [ amdgpu_module ];
|
||||
#boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelPackages = pkgs.linuxPackages_testing;
|
||||
#boot.kernelPackages = pkgs.linuxPackages_testing;
|
||||
#boot.kernelPackages = pkgs.linuxPackagesFor (pkgs.linux_6_13.override {
|
||||
# argsOverride = rec {
|
||||
# src = pkgs.fetchurl {
|
||||
# url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
# sha256 = "07c08x68fgcsgriss5z8w427h69y52s887vas91jzb5p70hbcf9s";
|
||||
# };
|
||||
# version = "6.13.7";
|
||||
# modDirVersion = "6.13.7";
|
||||
# };
|
||||
#});
|
||||
|
||||
boot.kernelPackages = let
|
||||
amd_drm_next_pkg = { fetchurl, buildLinux, ... }@args:
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.14.0-rc4";
|
||||
modDirVersion = version;
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://gitlab.freedesktop.org/agd5f/linux/-/archive/amd-drm-next-6.15-2025-03-14/linux-amd-drm-next-6.15-2025-03-14.tar.gz";
|
||||
# After the first build attempt, look for "hash mismatch" and then 2 lines below at the "got:" line.
|
||||
# Use "sha256-....." value here.
|
||||
hash = "sha256-/9EvJNBSKteXljrZzmaQkbZ7o4etCe0yFM3JJg/jD7o=";
|
||||
};
|
||||
kernelPatches = [ ];
|
||||
|
||||
extraMeta.branch = "6.14.0-rc4";
|
||||
} // (args.argsOverride or { }));
|
||||
linux_amd_drm_next = pkgs.callPackage amd_drm_next_pkg { };
|
||||
in pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_amd_drm_next);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user