From 854b107698de5b05f491324e3be049b0fc30f65d Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Fri, 12 Nov 2021 01:12:24 -0500 Subject: [PATCH] hardware/gpu/nvidia: revert nvidia changes --- profiles/hardware/gpu/nvidia.nix | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/profiles/hardware/gpu/nvidia.nix b/profiles/hardware/gpu/nvidia.nix index eee8907..4387095 100644 --- a/profiles/hardware/gpu/nvidia.nix +++ b/profiles/hardware/gpu/nvidia.nix @@ -1,33 +1,11 @@ -{ config, pkgs, lib, ... }: -let - nvidia_x11 = config.boot.kernelPackages.nvidia_x11; - nvidia_gl = nvidia_x11.out; - nvidia_gl_32 = nvidia_x11.lib32; -in -{ +{ ... }: { imports = [ ./common.nix ]; services.xserver.videoDrivers = [ "nvidia" ]; - boot = { - blacklistedKernelModules = [ "nouveau" ]; - extraModulePackages = [ nvidia_x11 ]; - }; - - hardware = { - nvidia = { - modesetting.enable = true; - powerManagement.enable = true; - }; - opengl = { - extraPackages = [ nvidia_gl ]; - extraPackages32 = [ nvidia_gl_32 ]; - }; - }; - - systemd.services.nvidia-control-devices = { - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${nvidia_x11.bin}/bin/nvidia-smi"; + hardware.nvidia = { + modesetting.enable = true; + powerManagement.enable = true; }; virtualisation.docker.enableNvidia = true;