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

3 files changed, 19 insertions, 23 deletions

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" ];
 }