Add amdgpu, remove nvidia

1 files changed, 7 insertions, 30 deletions

diff --git a/hosts/pihlaja/default.nix b/hosts/pihlaja/default.nix
index 3e49f68..214091f 100644
--- a/hosts/pihlaja/default.nix
+++ b/hosts/pihlaja/default.nix
@@ -2,15 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{
-  inputs,
-  outputs,
-  lib,
-  config,
-  pkgs,
-  vars,
-  ...
-}:
+{ config, pkgs, ... }:
 
 {
   imports = [ ./hardware-configuration.nix ];
@@ -19,21 +11,10 @@
     bluetooth.enable = true;
     keyboard.qmk.enable = true;
     logitech.wireless.enable = true;
-    nvidia = {
-      modesetting.enable = true;
-      powerManagement = {
-        enable = true;
-        finegrained = false;
-      };
-      open = true;
-      nvidiaSettings = false;
-      package = config.boot.kernelPackages.nvidiaPackages.latest;
-    };
-    graphics = {
-      extraPackages = with pkgs; [
-        nvidia-vaapi-driver
-        cudatoolkit
-      ];
+    amdgpu = {
+      opencl.enable = true;
+      initrd.enable = true;
+      overdrive.enable = true;
     };
 
     bluetooth.settings.General.Name = "pihlaja";
@@ -46,11 +27,7 @@
 
   environment = {
     sessionVariables = {
-      LIBVA_DRIVER_NAME = "nvidia";
-      VK_DRIVER_FILES = "/run/opengl-driver/share/vulkan/icd.d/nvidia_icd.x86_64.json";
-      GBM_BACKEND = "nvidia-drm";
-      __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-      NVD_BACKEND = "direct";
+      AMD_USERQ = 1; # bypass kernel
     };
     systemPackages = with pkgs; [
       logiops
@@ -152,7 +129,7 @@
       };
     };
     xserver = {
-      videoDrivers = [ "nvidia" ];
+      videoDrivers = [ "amdgpu" ];
     };
     udev.packages = with pkgs; [
       qmk