diff --git a/home-manager/opdavies/lemp11.nix b/home-manager/opdavies/lemp11.nix
index 95e97753..be2aaec1 100644
--- a/home-manager/opdavies/lemp11.nix
+++ b/home-manager/opdavies/lemp11.nix
@@ -3,9 +3,5 @@
 
   features = {
     cli.zsh.enable = true;
-
-    desktop.media = {
-      handbrake.enable = true;
-    };
   };
 }
diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index 837421a2..dafa10a3 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -16,10 +16,6 @@
 
     desktop = {
       gtk.enable = true;
-
-      media = {
-        handbrake.enable = true;
-      };
     };
   };
 
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 1b1163a5..48196b9c 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -3,7 +3,6 @@
     ./bookmarkthis.nix
     ./dev-commit.nix
     ./gtk.nix
-    ./media/handbrake.nix
     ./node.nix
     ./starship.nix
     ./zsh
diff --git a/modules/home-manager/media/handbrake.nix b/modules/home-manager/media/handbrake.nix
deleted file mode 100644
index e9e0c65b..00000000
--- a/modules/home-manager/media/handbrake.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.features.desktop.media.handbrake;
-in
-{
-  options.features.desktop.media.handbrake.enable = mkEnableOption "Enable handbrake";
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      handbrake
-    ];
-  };
-}
diff --git a/modules2/handbrake.nix b/modules2/handbrake.nix
new file mode 100644
index 00000000..8a8532a9
--- /dev/null
+++ b/modules2/handbrake.nix
@@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.gui =
+    { pkgs, ... }:
+    {
+      home.packages = [ pkgs.handbrake ];
+    };
+}