From 76cf402e52fca786374fbf4bfa1d77b97de20de6 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Sun, 23 Jul 2023 19:27:43 -0700 Subject: [PATCH] fix nvidia driver version for wayland (use unstable) --- flake.nix | 7 ++++++- systems/NOcomputer.nix | 14 +++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index c9d2b31..ed79c83 100644 --- a/flake.nix +++ b/flake.nix @@ -9,8 +9,13 @@ outputs = { nixpkgs, nixos-hardware, nixpkgs-unstable, ... }: let + system = "x86_64-linux"; overlay-unstable = final: prev: { - unstable = nixpkgs-unstable.legacyPackages.x86_64-linux; + # unstable = nixpkgs-unstable.legacyPackages.x86_64-linux; + unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; }; nixosSystem = (systemModules: nixpkgs.lib.nixosSystem { modules = systemModules; }); nixos-hw = nixos-hardware.nixosModules; diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 14f1d21..34d3130 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -6,9 +6,15 @@ openrgb gwe liquidctl - egl-wayland + # egl-wayland + # nvidia-vaapi-driver ]; + # environment.sessionVariables = { + # # wayland chromium workaround + # NIXOS_OZONE_WL = "1"; + # }; + fileSystems."/home" = { device = "/dev/disk/by-uuid/eb9fcce2-e9f3-438a-b5ce-8f72f32f0e09"; fsType = "btrfs"; @@ -67,10 +73,8 @@ }; hardware.nvidia = { modesetting.enable = true; - package = config.boot.kernelPackages.nvidiaPackages.beta; - # package = (config.boot.kernelPackages.callPackage - # "${pkgs.unstable.path}/pkgs/os-specific/linux/nvidia-x11/default.nix" - # { }); + # package = config.boot.kernelPackages.nvidiaPackages.beta; + package = pkgs.unstable.linuxPackages_latest.nvidiaPackages.production; }; networking.hostName = "NOcomputer";