diff --git a/flake.lock b/flake.lock index ed5515d..506dc58 100644 --- a/flake.lock +++ b/flake.lock @@ -502,16 +502,16 @@ "kernel-src": { "flake": false, "locked": { - "lastModified": 1770032463, - "narHash": "sha256-dNxD+k9uxBQdTEnAHN8oZXS4Wl3RhlxG71R5rxxwQAo=", - "ref": "refs/tags/drm-intel-next-fixes-2026-02-05", - "rev": "3e28a67a85f9b569066f6dfcddadb39294c0c9d4", + "lastModified": 1773006395, + "narHash": "sha256-f3IzNvzYFskEwgQZi2v0g5tcKabCUZfpDHn2x5dpNIU=", + "ref": "refs/heads/drm-tip", + "rev": "6884fe03ff2bc5a2f501ba4710f950dd4933ac84", "shallow": true, "type": "git", "url": "https://gitlab.freedesktop.org/drm/tip.git" }, "original": { - "ref": "refs/tags/drm-intel-next-fixes-2026-02-05", + "rev": "6884fe03ff2bc5a2f501ba4710f950dd4933ac84", "shallow": true, "type": "git", "url": "https://gitlab.freedesktop.org/drm/tip.git" diff --git a/flake.nix b/flake.nix index 664a91b..cb6643e 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/latest"; kernel-src = { # url = "git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git?ref=master"; - url = "git+https://gitlab.freedesktop.org/drm/tip.git?ref=refs/tags/drm-intel-next-fixes-2026-02-05&shallow=1"; + url = "git+https://gitlab.freedesktop.org/drm/tip.git?rev=6884fe03ff2bc5a2f501ba4710f950dd4933ac84&shallow=1"; flake = false; }; sccache = { @@ -71,6 +71,7 @@ pkgs, pkgdefault, config, + lib, ... }: { @@ -130,13 +131,68 @@ v4l2loopback # amneziawg ]; - # kernelPatches = [ - # { - # name = "7.0-rc fixup"; - # extraConfig = '' - # ''; - # } - # ]; + kernelParams = [ "mitigations=off" ]; + kernelPatches = [ + { + name = "gpu"; + structuredExtraConfig = ( + with lib.kernel; + { + CPU_SUP_INTEL = no; + CPU_SUP_HYGON = no; + CPU_SUP_CENTAUR = no; + CPU_SUP_ZHAOXIN = no; + # + X86_MCE_INTEL = no; + } + ); + } + { + name = "gpu"; + structuredExtraConfig = ( + with lib.kernel; + { + DRM_AMDGPU = no; + DRM_KOMEDA = no; + DRM_NOUVEAU = no; + DRM_RADEON = no; + # + FB_NVIDIA = no; + FB_RADEON = no; + } + ); + } + { + name = "go crazy, go stupid"; + structuredExtraConfig = ( + with lib.kernel; + { + # CPU_MITIGATIONS = no; + } + ); + } + { + name = "audio"; + structuredExtraConfig = ( + with lib.kernel; + { + SND_SEQ_DEVICE = no; + SND_SEQUENCER = no; + SND_SEQ_DUMMY = no; + SND_HRTIMER = no; + } + ); + } + { + name = "network"; + structuredExtraConfig = ( + with lib.kernel; + { + # VLAN_8021Q = no; + } + ); + } + ]; }; # nixpkgs.config.permittedInsecurePackages = [ # "olm-3.2.16" @@ -259,7 +315,7 @@ }; traceroute.enable = true; ydotool = { - enable = true; + # enable = true; group = "wheel"; }; };