Use nixos-hardware to set some hardware specific stuff

flake.nix

@@ -11,6 +11,8 @@
 
     flake-utils.url = "github:numtide/flake-utils";
 
+    nixos-hardware.url = github:NixOS/nixos-hardware;
+
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -56,6 +58,7 @@
 
   outputs =
     { self
+    , nixos-hardware
     , sops
     , ha-now-playing
     , pamedia
@@ -156,6 +159,9 @@
           loki = defSystem "x86_64-linux" {
             imports = [
               (import ./machines/loki/configuration.nix { inherit self nixpkgs; })
+              nixos-hardware.nixosModules.common-cpu-amd
+              nixos-hardware.nixosModules.common-gpu-amd
+              nixos-hardware.nixosModules.common-pc-ssd
             ];
           };
 

machines/loki/hardware-configuration.nix

@@ -13,10 +13,10 @@
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" "apple-mfi-fastcharge" ];
+  boot.kernelModules = [ "kvm-amd" "apple-mfi-fastcharge" "zenpower" ];
-  boot.extraModulePackages = [
+  boot.extraModulePackages = [ ] ++
-    (with config.boot.kernelPackages; rtl88x2bu)
+    (with config.boot.kernelPackages; [ rtl88x2bu zenpower ]);
-  ];
+
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/42065c7e-d0aa-4de8-a913-014cf59d48ac";

modules/base/default.nix

@@ -45,16 +45,7 @@ in
       enable = true;
     };
 
-    hardware.opengl = {
+    hardware.opengl.enable = true;
-      enable = true;
-      driSupport = true;
-
-      extraPackages = with pkgs; [
-        rocm-opencl-icd
-        rocm-opencl-runtime
-        rocm-runtime
-      ];
-    };
 
     programs.fish.enable = true;
 
@@ -65,6 +56,7 @@ in
       file
       ht-rust
       jq
+      lm_sensors
       nix-template
       nvd
       usbutils