From cff6bf01674da96e184e9f2b46c2d5808f0417b9 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 27 Jul 2025 21:58:27 +0100
Subject: [PATCH] Move mpv configuration

---
 home-manager/opdavies/lemp11.nix   |  1 -
 home-manager/opdavies/t480.nix     |  1 -
 modules/home-manager/default.nix   |  1 -
 modules/home-manager/media/mpv.nix | 27 ---------------------------
 modules2/mpv/bindings.nix          |  7 +++++++
 modules2/mpv/enable.nix            |  3 +++
 6 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 modules/home-manager/media/mpv.nix
 create mode 100644 modules2/mpv/bindings.nix
 create mode 100644 modules2/mpv/enable.nix

diff --git a/home-manager/opdavies/lemp11.nix b/home-manager/opdavies/lemp11.nix
index de3a13fd..95e97753 100644
--- a/home-manager/opdavies/lemp11.nix
+++ b/home-manager/opdavies/lemp11.nix
@@ -6,7 +6,6 @@
 
     desktop.media = {
       handbrake.enable = true;
-      mpv.enable = true;
     };
   };
 }
diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index 14d191ee..45574fd8 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -31,7 +31,6 @@
 
       media = {
         handbrake.enable = true;
-        mpv.enable = true;
       };
     };
   };
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 564f4e2e..ed956ca7 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -7,7 +7,6 @@
     ./dev-commit.nix
     ./gtk.nix
     ./media/handbrake.nix
-    ./media/mpv.nix
     ./node.nix
     ./ranger.nix
     ./redshift.nix
diff --git a/modules/home-manager/media/mpv.nix b/modules/home-manager/media/mpv.nix
deleted file mode 100644
index 4e685082..00000000
--- a/modules/home-manager/media/mpv.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.features.desktop.media.mpv;
-in
-{
-  options.features.desktop.media.mpv.enable = mkEnableOption "Enable mpv";
-
-  config = mkIf cfg.enable {
-    programs.mpv = {
-      enable = true;
-
-      # https://github.com/mpv-player/mpv/blob/master/etc/input.conf
-      bindings = {
-        "DOWN" = "add volume -5";
-        "UP" = "add volume 5";
-      };
-    };
-  };
-}
diff --git a/modules2/mpv/bindings.nix b/modules2/mpv/bindings.nix
new file mode 100644
index 00000000..314514f4
--- /dev/null
+++ b/modules2/mpv/bindings.nix
@@ -0,0 +1,7 @@
+{
+  # https://github.com/mpv-player/mpv/blob/master/etc/input.conf
+  flake.modules.homeManager.gui.programs.mpv.bindings = {
+    "DOWN" = "add volume -5";
+    "UP" = "add volume 5";
+  };
+}
diff --git a/modules2/mpv/enable.nix b/modules2/mpv/enable.nix
new file mode 100644
index 00000000..6985bfee
--- /dev/null
+++ b/modules2/mpv/enable.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.gui.programs.mpv.enable = true;
+}