diff --git a/hosts/idols-ai/hardware-configuration.nix b/hosts/idols-ai/hardware-configuration.nix index 0df24ba1..e53f9101 100644 --- a/hosts/idols-ai/hardware-configuration.nix +++ b/hosts/idols-ai/hardware-configuration.nix @@ -41,8 +41,7 @@ boot.loader.systemd-boot.enable = true; # https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/top-level/linux-kernels.nix - boot.kernelPackages = pkgs.linuxPackages_latest; - # boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; + boot.kernelPackages = pkgs.linuxPackages_6_18; # 6.19 works not well with nvidia driver boot.initrd.availableKernelModules = [ "xhci_pci" diff --git a/hosts/idols-ai/nvidia.nix b/hosts/idols-ai/nvidia.nix index a9af4b9e..3e040213 100644 --- a/hosts/idols-ai/nvidia.nix +++ b/hosts/idols-ai/nvidia.nix @@ -27,24 +27,7 @@ # package = config.boot.kernelPackages.nvidiaPackages.production; # https://github.com/NixOS/nixpkgs/issues/489947 - # Apply CachyOS kernel 6.19 patch to NVIDIA latest driver - package = - let - base = config.boot.kernelPackages.nvidiaPackages.latest; - cachyos-nvidia-patch = pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/CachyOS/CachyOS-PKGBUILDS/master/nvidia/nvidia-utils/kernel-6.19.patch"; - sha256 = "sha256-YuJjSUXE6jYSuZySYGnWSNG5sfVei7vvxDcHx3K+IN4="; - }; - - # Patch the appropriate driver based on config.hardware.nvidia.open - driverAttr = if config.hardware.nvidia.open then "open" else "bin"; - in - base - // { - ${driverAttr} = base.${driverAttr}.overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or [ ]) ++ [ cachyos-nvidia-patch ]; - }); - }; + package = config.boot.kernelPackages.nvidiaPackages.latest; # required by most wayland compositors! modesetting.enable = true;