Use nixos-hardware

flake.lock

@@ -21,6 +21,21 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1650522846,
+        "narHash": "sha256-SxWHXRI3qJwswyXAtzsi6PKVY3KLNNnb072KaJthII8=",
+        "owner": "nixos",
+        "repo": "nixos-hardware",
+        "rev": "6b4ebea9093c997c5f275c820e679108de4871ab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1652020977,
@@ -39,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1651726670,
-        "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=",
+        "lastModified": 1652082323,
+        "narHash": "sha256-7GSVLvfCJtH9dJ3om9Lg4fsi9UKvoxxR69gUTcx0ol8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01",
+        "rev": "2a3aac479caeba0a65b2ad755fe5f284f1fde74d",
         "type": "github"
       },
       "original": {
@@ -72,6 +87,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "private": "private",

flake.nix

@@ -2,6 +2,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixos-hardware.url = "github:nixos/nixos-hardware";
 
     home-manager = {
       url = "github:nix-community/home-manager/release-21.11";

sets/cpu/amd.nix

@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  hardware.cpu.amd.updateMicrocode = true;
-}

sets/cpu/intel.nix

@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  hardware.cpu.intel.updateMicrocode = true;
-  environment.systemPackages = with pkgs; [
-    i7z
-  ];
-}

sets/gpu/amd.nix

@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  hardware.opengl.extraPackages = with pkgs; [
-    rocm-opencl-icd
-    rocm-runtime
-  ];
-  environment.systemPackages = [ pkgs.rocm-smi ];
-}

sets/gpu/intel.nix

@@ -1,10 +0,0 @@
-{ config, pkgs, ... }:
-{
-  hardware.opengl.extraPackages = with pkgs; [
-    intel-media-driver
-    intel-compute-runtime
-  ];
-  environment.systemPackages = with pkgs; [
-    intel-gpu-tools
-  ];
-}

system/rainbowdash/default.nix

@@ -1,12 +1,10 @@
-{ config, ... }:
+{ config, inputs, ... }:
 
 {
   imports = [
     ./boot-config.nix
     ./secure-boot.nix
     ./hardware-configuration.nix
-    ../../sets/cpu/intel.nix
-    ../../sets/gpu/intel.nix
     ../../sets/buildMachines.nix
     ../../sets/hardware.nix
     ../../sets/hacking.nix
@@ -14,6 +12,7 @@
     ../../sets/1password.nix
     ../../sets/workstation.nix
     ../../sets/krb5.nix
+    inputs.nixos-hardware.nixosModules.dell-xps-13-9380
   ];
 
   boot.supportedFilesystems = [ "nfs4" ];

system/spike/default.nix

@@ -1,16 +1,15 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   imports = [
     ./boot-config.nix
     ./hardware-configuration.nix
-    ../../sets/cpu/intel.nix
-    ../../sets/gpu/intel.nix
     ../../sets/hacking.nix
     ../../sets/laptop.nix
     ../../sets/sshd.nix
     ../../sets/buildMachines.nix
     ../../sets/workstation.nix
+    inputs.nixos-hardware.nixosModules.gpd-micropc
   ];
 
   networking.hostName = "spike";

system/starlight/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
 
 {
   imports = [
@@ -7,9 +7,7 @@
     ./scripts.nix
     ./postgres.nix
     ../../sets/builder.nix
-    ../../sets/cpu/amd.nix
     ../../sets/fpga.nix
-    ../../sets/gpu/amd.nix
     ../../sets/hacking.nix
     ../../sets/hardware.nix
     ../../sets/krb5.nix
@@ -18,6 +16,8 @@
     ../../sets/virtualization.nix
     ../../sets/workstation.nix
     ../../sets/1password.nix
+    inputs.nixos-hardware.nixosModules.common-cpu-amd
+    inputs.nixos-hardware.nixosModules.common-gpu-amd
   ];
 
   # Network