From 3cb10af03c629a7fcbb9b48f85f9efc8a6f6f731 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sun, 7 Jul 2024 00:17:24 +0200
Subject: [PATCH] chore: address trace warnings

---
 config/hardware/nvidia.nix | 16 +++++++---------
 hosts/kroma/default.nix    |  1 -
 hosts/nom/default.nix      | 35 ++++++++---------------------------
 3 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/config/hardware/nvidia.nix b/config/hardware/nvidia.nix
index d67d694..c7f226c 100644
--- a/config/hardware/nvidia.nix
+++ b/config/hardware/nvidia.nix
@@ -9,20 +9,18 @@ lib.optionalAttrs (!minimal) {
   services.xserver.videoDrivers = lib.mkForce ["nvidia"];
 
   hardware = {
-    nvidia = {
-      modesetting.enable = true;
-      nvidiaPersistenced = true;
-      nvidiaSettings = true;
-      open = true;
-      powerManagement.enable = true;
-    };
-    opengl = {
+    graphics = {
       enable = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
       extraPackages = with pkgs; [
         vaapiVdpau
         nvidia-vaapi-driver
       ];
     };
+    nvidia = {
+      modesetting.enable = true;
+      open = true;
+      powerManagement.enable = true;
+    };
   };
 }
diff --git a/hosts/kroma/default.nix b/hosts/kroma/default.nix
index 0ac6de2..d5fe1a8 100644
--- a/hosts/kroma/default.nix
+++ b/hosts/kroma/default.nix
@@ -10,7 +10,6 @@
     inputs.nixos-hardware.nixosModules.common-cpu-amd
     inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
     inputs.nixos-hardware.nixosModules.common-pc
-    inputs.nixos-hardware.nixosModules.common-pc-hdd
     inputs.nixos-hardware.nixosModules.common-pc-ssd
 
     ../../config
diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix
index 81e012a..632b1f1 100644
--- a/hosts/nom/default.nix
+++ b/hosts/nom/default.nix
@@ -1,6 +1,5 @@
 {
   inputs,
-  lib,
   pkgs,
   ...
 }: {
@@ -11,9 +10,10 @@
 
     ../../config
 
-    ../../config/hardware/intel.nix
-    ../../config/hardware/physical.nix
     ../../config/hardware/bluetooth.nix
+    ../../config/hardware/intel.nix
+    ../../config/hardware/nvidia.nix
+    ../../config/hardware/physical.nix
 
     ../../config/dev
     ../../config/graphical
@@ -39,31 +39,12 @@
 
   # FIXME: fuck optional modules and make this more adjustable via settings
   graphical.gaming.enable = true;
-  boot.blacklistedKernelModules = ["nouveau"];
-  services.xserver.videoDrivers = lib.mkForce ["nvidia"];
 
-  hardware = {
-    nvidia = {
-      prime = {
-        offload.enable = true;
-        offload.enableOffloadCmd = true;
-        intelBusId = "PCI:0:2:0";
-        nvidiaBusId = "PCI:1:0:0";
-      };
-      modesetting.enable = true;
-      nvidiaPersistenced = true;
-      nvidiaSettings = true;
-      open = false;
-      powerManagement.enable = false;
-    };
-    opengl = {
-      enable = true;
-      driSupport32Bit = true;
-      extraPackages = with pkgs; [
-        vaapiVdpau
-        nvidia-vaapi-driver
-      ];
-    };
+  hardware.nvidia.prime = {
+    offload.enable = true;
+    offload.enableOffloadCmd = true;
+    intelBusId = "PCI:0:2:0";
+    nvidiaBusId = "PCI:1:0:0";
   };
 
   topology.self.icon = "devices.laptop";