From cc731cf464a7f0d52399333d682d1ec81fc58ecf Mon Sep 17 00:00:00 2001 From: Mark Nipper Date: Fri, 27 Dec 2024 01:19:39 -0800 Subject: Move to 6.12 on master branch and enable nvidia-patch @arrakis --- hosts/arrakis/default.nix | 4 ++-- hosts/arrakis/hardware-configuration.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index e4957d6..403f613 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -5,7 +5,7 @@ "net.ipv4.ip_forward" = 1; "net.ipv4.conf.all.proxy_arp" = 1; }; - kernelPackages = pkgs.linuxPackages_6_12; + kernelPackages = pkgs.master.linuxPackages_6_12; loader = { efi = { canTouchEfiVariables = true; @@ -224,7 +224,7 @@ }; hostPlatform = "x86_64-linux"; overlays = [ - #inputs.nvidia-patch.overlays.default + inputs.nvidia-patch.overlays.default outputs.overlays.additions outputs.overlays.modifications outputs.overlays.master-packages diff --git a/hosts/arrakis/hardware-configuration.nix b/hosts/arrakis/hardware-configuration.nix index 1c4401d..982f62f 100644 --- a/hosts/arrakis/hardware-configuration.nix +++ b/hosts/arrakis/hardware-configuration.nix @@ -61,8 +61,8 @@ nvidia = { modesetting.enable = true; open = true; - #package = pkgs.nvidia-patch.patch-nvenc (pkgs.nvidia-patch.patch-fbc config.boot.kernelPackages.nvidiaPackages.beta); - package = config.boot.kernelPackages.nvidiaPackages.beta; + package = pkgs.nvidia-patch.patch-nvenc (pkgs.nvidia-patch.patch-fbc config.boot.kernelPackages.nvidiaPackages.beta); + #package = config.boot.kernelPackages.nvidiaPackages.beta; }; }; } -- cgit v1.2.3