diff --git a/hosts/t480/modules/default.nix b/hosts/t480/modules/default.nix
index 4d7442c0..df830b8c 100644
--- a/hosts/t480/modules/default.nix
+++ b/hosts/t480/modules/default.nix
@@ -1,6 +1,7 @@
 {
   imports = [
     ./cron.nix
+    ./desktop
     ./neomutt.nix
     ./newsboat
     ./ollama.nix
diff --git a/hosts/t480/modules/desktop/default.nix b/hosts/t480/modules/desktop/default.nix
new file mode 100644
index 00000000..7c256895
--- /dev/null
+++ b/hosts/t480/modules/desktop/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./media
+  ];
+}
diff --git a/hosts/t480/modules/desktop/media/default.nix b/hosts/t480/modules/desktop/media/default.nix
new file mode 100644
index 00000000..2efff1fb
--- /dev/null
+++ b/hosts/t480/modules/desktop/media/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./makemkv.nix
+  ];
+}
diff --git a/hosts/t480/modules/desktop/media/makemkv.nix b/hosts/t480/modules/desktop/media/makemkv.nix
new file mode 100644
index 00000000..aa394d2a
--- /dev/null
+++ b/hosts/t480/modules/desktop/media/makemkv.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    makemkv
+  ];
+
+  boot.kernelModules = [ "sg" ];
+
+  # TODO: is this needed?
+  users.users.opdavies.extraGroups = [ "cdrom" ];
+}