refactor: move nvidia settings to hardware/nvidia

README.md

@@ -16,12 +16,12 @@ This is my personal nix config. It's still in the making, but this is what I got
 |  | Name | Type | Purpose
 ---|---|---|---
 💻 | nom | Gigabyte AERO 15-W8 (i7-8750H) | My laptop and my main portable development machine <sub>Framework when?</sub>
+🖥️ | potksed | PC (AMD Ryzen 9 5900X) | Main workstation and development machine
 🖥️ | ward | ODROID H3 | Energy efficient SBC for my home firewall and some lightweight services using microvms.
 🥔 | zackbiene | ODROID N2+ | ARM SBC for home automation, isolating the sketchy stuff from my main network
 ☁️  | envoy | Hetzner Cloud server | Mailserver
 ☁️  | sentinel | Hetzner Cloud server | Proxies and protects my local services
 
-<!-- 🖥️ workstation -->
 <!-- 🖥️ home server -->
 
 <sub>

hosts/potksed/default.nix

@@ -12,6 +12,7 @@
     inputs.nixos-hardware.nixosModules.common-pc-ssd
 
     ../../modules/optional/hardware/physical.nix
+    ../../modules/optional/hardware/nvidia.nix
 
     ../../modules
     ../../modules/optional/boot-efi.nix
@@ -30,21 +31,7 @@
 
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
 
-  hardware.nvidia.modesetting.enable = true;
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-  };
-  hardware.nvidia.powerManagement.enable = true;
-  hardware.nvidia.open = false;
-  hardware.nvidia.nvidiaSettings = true;
-
-  environment.systemPackages = with pkgs; [
-    killall
-    vaapiVdpau
-    libvdpau-va-gl
-  ];
+  # TODO goodbye once -sk keys.
   environment.shellInit = ''
     gpg-connect-agent /bye
     export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)

modules/optional/graphical/default.nix

@@ -3,4 +3,9 @@
     ./fonts.nix
     ./wayland.nix
   ];
+
+  environment.systemPackages = with pkgs; [
+    vaapiVdpau
+    libvdpau-va-gl
+  ];
 }

modules/optional/hardware/nvidia.nix

@@ -5,12 +5,14 @@
     nvidia = {
       modesetting.enable = true;
       nvidiaPersistenced = true;
+      nvidiaSettings = true;
+      open = false;
+      powerManagement.enable = true;
     };
     opengl = {
       enable = true;
+      driSupport = true;
       driSupport32Bit = true;
     };
   };
-
-  services.xserver.videoDrivers = ["nvidia"];
 }

users/common/utils.nix

@@ -6,6 +6,7 @@
       fd
       file
       hexyl
+      killall
       ncdu
       neofetch
       rage