diff --git a/machines/nunotaba/configuration.nix b/machines/nunotaba/configuration.nix
index a0c3e3e..518bb55 100644
--- a/machines/nunotaba/configuration.nix
+++ b/machines/nunotaba/configuration.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ./hardware-configuration.nix
+      ../../modules/gpu/intel.nix
       ../../modules/restic.nix
       (import ../../modules/libvirt.nix { inherit pkgs; gui = true; })
       #../../modules/texlive.nix
diff --git a/modules/gpu/intel.nix b/modules/gpu/intel.nix
new file mode 100644
index 0000000..5983f50
--- /dev/null
+++ b/modules/gpu/intel.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  hardware.opengl.extraPackages = [ pkgs.vaapiIntel ];
+}
diff --git a/modules/media.nix b/modules/media.nix
index 0923316..39aa0ad 100644
--- a/modules/media.nix
+++ b/modules/media.nix
@@ -42,8 +42,4 @@
       mkvtoolnix-cli # matroska (de-)muxing
     ]
   );
-
-  hardware.opengl.extraPackages = with pkgs; if gui then [
-    pkgs.vaapiIntel
-  ] else [ ];
 }