diff --git a/flake.nix b/flake.nix
index 3c9e631..e5ace4e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -134,6 +134,7 @@ rec {
               inputs.nixos-hardware.nixosModules.common-pc
               inputs.nixos-hardware.nixosModules.common-pc-ssd
               inputs.nixos-hardware.nixosModules.common-cpu-intel
+              inputs.nixos-hardware.nixosModules.common-gpu-intel
               (self.lib.createSystem "pilot1" {
                 hardwareConfig = ./hardware/pilot1.nix;
                 config = ./hosts/work-pc.nix;
@@ -154,6 +155,7 @@ rec {
               inputs.nixos-hardware.nixosModules.common-pc
               inputs.nixos-hardware.nixosModules.common-pc-ssd
               inputs.nixos-hardware.nixosModules.common-cpu-intel-kaby-lake
+              inputs.nixos-hardware.nixosModules.common-gpu-intel
               inputs.matrix-appservices.nixosModule
               (self.lib.createSystem "home-server" {
                 hardwareConfig = ./hardware/lattepanda.nix;
diff --git a/hardware/gpu-amd.nix b/hardware/gpu-amd.nix
deleted file mode 100644
index ef69369..0000000
--- a/hardware/gpu-amd.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-
-{
-  boot.initrd.kernelModules = [ "amdgpu" ];
-
-  hardware.opengl = {
-    driSupport = true;
-    driSupport32Bit = true;
-    extraPackages = with pkgs; [ libvdpau-va-gl vaapiVdpau ];
-    extraPackages32 = with pkgs.driversi686Linux; [ libvdpau-va-gl vaapiVdpau ];
-  };
-
-  environment.systemPackages = with pkgs; [ glxinfo vulkan-tools ];
-}
diff --git a/hardware/gpu-intel.nix b/hardware/gpu-intel.nix
deleted file mode 100644
index c396d43..0000000
--- a/hardware/gpu-intel.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  boot.initrd.kernelModules = [ "i915" ];
-
-  # kaby lake
-  boot.kernelParams = [ "i915.enable_guc=3" ];
-
-  environment.variables = {
-    VDPAU_DRIVER =
-      lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
-  };
-
-  hardware.opengl = {
-    extraPackages = with pkgs; [
-      intel-vaapi-driver
-      intel-media-driver
-      intel-compute-runtime
-      libvdpau-va-gl
-    ];
-    extraPackages32 = with pkgs.driversi686Linux; [
-      intel-vaapi-driver
-      intel-media-driver
-      libvdpau-va-gl
-    ];
-  };
-}
diff --git a/hardware/lattepanda.nix b/hardware/lattepanda.nix
index 63ab3c3..3bad9f6 100644
--- a/hardware/lattepanda.nix
+++ b/hardware/lattepanda.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, ... }:
 
 {
   boot.initrd.availableKernelModules = [
@@ -13,6 +13,7 @@
   ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelParams = [ "i915.enable_guc=3" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
diff --git a/hosts/home-pc.nix b/hosts/home-pc.nix
index f5ae837..246ba91 100644
--- a/hosts/home-pc.nix
+++ b/hosts/home-pc.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ../hardware/base.nix
-    ../hardware/gpu-amd.nix
     ../hardware/bluetooth.nix
     ../hardware/xbox.nix
     ../hardware/steam.nix
diff --git a/hosts/home-server.nix b/hosts/home-server.nix
index 9bb210a..8a42959 100644
--- a/hosts/home-server.nix
+++ b/hosts/home-server.nix
@@ -11,7 +11,6 @@ let
 in {
   imports = [
     ../hardware/base.nix
-    ../hardware/gpu-intel.nix
     ../desktop/x11.nix
     ../system/server.nix
     ../virtualisation/containers.nix
diff --git a/hosts/work-pc.nix b/hosts/work-pc.nix
index b7de034..5d92731 100644
--- a/hosts/work-pc.nix
+++ b/hosts/work-pc.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ../hardware/base.nix
-    ../hardware/gpu-intel.nix
     ../hardware/bluetooth.nix
     ../system/desktop.nix
     ../system/printing/home.nix