inline some intel code from nixos-hardware and remove the dep

6 files changed, 48 insertions, 42 deletions

diff --git a/flake.lock b/flake.lock
index ae564a2..30e0aa2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,22 +21,6 @@
         "type": "github"
       }
     },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1735388221,
-        "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
-        "owner": "nixos",
-        "repo": "nixos-hardware",
-        "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1781074563,
@@ -56,7 +40,6 @@
     "root": {
       "inputs": {
         "disko": "disko",
-        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index 02ebea7..31c498a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,8 +5,6 @@
 
     disko.url = "github:nix-community/disko/latest";
     disko.inputs.nixpkgs.follows = "nixpkgs";
-
-    nixos-hardware.url = "github:nixos/nixos-hardware/master";
   };
 
   outputs =
diff --git a/machines/iridium.nix b/machines/iridium.nix
index 5f30c81..ef3d55b 100644
--- a/machines/iridium.nix
+++ b/machines/iridium.nix
@@ -1,18 +1,16 @@
-{ inputs, flake, ... }:
-let
-  inherit (inputs.nixos-hardware.nixosModules)
-    common-cpu-intel
-    common-gpu-intel
-    ;
-in
+{
+  flake,
+  pkgs,
+  config,
+  ...
+}:
 {
   nixpkgs.hostPlatform.system = "x86_64-linux";
   system.stateVersion = "25.05";
   networking.hostName = "iridium";
 
   imports = [
-    common-cpu-intel
-    common-gpu-intel
+    flake.outputs.nixosModules.intel
     flake.outputs.nixosModules.network
   ];
 
diff --git a/machines/radon/default.nix b/machines/radon/default.nix
index 399eb5b..c77db03 100644
--- a/machines/radon/default.nix
+++ b/machines/radon/default.nix
@@ -1,10 +1,5 @@
 { inputs, flake, pkgs, config, ... }:
 let
-  inherit (inputs.nixos-hardware.nixosModules)
-    common-cpu-intel
-    common-gpu-intel
-    ;
-
   interfaces = {
     bottom = "enp1s0";
     top = "enp2s0";
@@ -12,11 +7,10 @@ let
 in
 {
   imports = [
-    common-cpu-intel
-    common-gpu-intel
     # ./jellyfin.nix
     ./pxeboot.nix
     flake.outputs.nixosModules.disk
+    flake.outputs.nixosModules.intel
     flake.outputs.nixosModules.network
   ];
 
diff --git a/machines/t480.nix b/machines/t480.nix
index 48a2438..e779694 100644
--- a/machines/t480.nix
+++ b/machines/t480.nix
@@ -1,14 +1,15 @@
-{ inputs, flake, perSystem, pkgs, ... }:
+{
+  flake,
+  perSystem,
+  pkgs,
+  ...
+}:
 let
-  inherit (inputs.nixos-hardware.nixosModules)
-    lenovo-thinkpad-t480
-    ;
-
   inherit (import flake.outputs.nixosModules.users { inherit perSystem pkgs; }) kle;
 in
 {
   imports = [
-    lenovo-thinkpad-t480
+    flake.outputs.nixosModules.intel
     flake.outputs.nixosModules.desktop
   ];
 
@@ -37,7 +38,10 @@ in
   };
 
   programs.nm-applet.enable = true;
-  services.fwupd.enable = true;
+  services = {
+    fwupd.enable = true;
+    throttled.enable = true;
+  };
 
   xnet.persist = [ "/etc/NetworkManager/system-connections" ];
 }
diff --git a/modules/intel.nix b/modules/intel.nix
new file mode 100644
index 0000000..4ea61ab
--- /dev/null
+++ b/modules/intel.nix
@@ -0,0 +1,29 @@
+{ pkgs, ... }: {
+  boot.kernelParams = [ "i915.enable_guc=2" ];
+
+  hardware = {
+    cpu.intel.updateMicrocode = true;
+
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+
+      # Here we prefer the legacy Intel GPU packages since I only own
+      # skylake-based systems
+      extraPackages = with pkgs; [
+        # accelerated video playback
+        intel-vaapi-driver
+        intel-media-driver
+        libva-vdpau-driver
+
+        # OpenCL and other compute fun
+        intel-compute-runtime-legacy1
+      ];
+
+      extraPackages32 = with pkgs.driversi686Linux; [
+        intel-media-driver
+        libva-vdpau-driver
+      ];
+    };
+  };
+}