Merge pull request 'nvidia-wayland' (#1) from nvidia-wayland into master

Reviewed-on: https://git.sortug.com/polwex/nixconf/pulls/1

1 files changed, 31 insertions, 12 deletions

diff --git a/hosts/local/nvidia.nix b/hosts/local/nvidia.nix
index 4b2e67a..295d05d 100644
--- a/hosts/local/nvidia.nix
+++ b/hosts/local/nvidia.nix
@@ -1,7 +1,23 @@
-{config, pkgs, ...}: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  nverStable = config.boot.kernelPackages.nvidiaPackages.stable.version;
+  nverBeta = config.boot.kernelPackages.nvidiaPackages.beta.version;
+  nvidiaPackage =
+    if (lib.versionOlder nverBeta nverStable)
+    then config.boot.kernelPackages.nvidiaPackages.stable
+    else config.boot.kernelPackages.nvidiaPackages.beta;
+in {
   boot.kernelModules = ["nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm"];
   # boot.kernelPackages = lib.mkForce unfreePkgs.linuxKernel.packages.linux_xanmod_latest;
   # boot.kernelParams = ["video=HDMI-A-1:1920x1080"];
+  #
+  hardware.graphics = {
+    enable = true;
+  };
   # hardware.graphics= {
   # package = (pkgs.mesa.override { galliumDrivers = [ "i915" "swrast" ]; }).drivers;
   #   enable = true;
@@ -11,23 +27,27 @@
     "https://cuda-maintainers.cachix.org"
   ];
   nix.settings.trusted-public-keys = [
-   "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
+    "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
   ];
-  
+
   services.xserver = {
     videoDrivers = ["nvidia"];
+    # wayland only
+    # displayManager.gdm.wayland = true;
+    #
   };
   # environment.systemPackages = with pkgs;[
-    # libva-utils
-    # nvidia-vaapi-driver
-    # pciutils
-    # vdpauinfo
-    # (blender.override {
-    #   cudaSupport = true;
-    # })
+  # libva-utils
+  # nvidia-vaapi-driver
+  # pciutils
+  # vdpauinfo
+  # (blender.override {
+  #   cudaSupport = true;
+  # })
   # ];
   hardware.nvidia = {
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
+    # package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = nvidiaPackage;
     modesetting.enable = true;
     powerManagement.enable = false;
     powerManagement.finegrained = false;
@@ -44,5 +64,4 @@
 
   #     ibtSupport = true;
   # };
-  
 }