From 21198b5bf9a2c941200101a9218cffeebaa85db8 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sat, 5 Apr 2025 09:17:15 +0100
Subject: [PATCH] Extract an mpv mixin

---
 home/opdavies/hosts/lemp11.nix                |  1 -
 home/opdavies/hosts/t480.nix                  |  1 -
 home/opdavies/hosts/t490.nix                  |  1 -
 hosts/t480/configuration.nix                  |  1 +
 .../home-manager/desktop/media/default.nix    |  1 -
 modules/home-manager/desktop/media/mpv.nix    | 19 -------------------
 modules/mixins/mpv.nix                        | 11 +++++++++++
 7 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 modules/home-manager/desktop/media/mpv.nix
 create mode 100644 modules/mixins/mpv.nix

diff --git a/home/opdavies/hosts/lemp11.nix b/home/opdavies/hosts/lemp11.nix
index b36901f8..ff2bdef6 100644
--- a/home/opdavies/hosts/lemp11.nix
+++ b/home/opdavies/hosts/lemp11.nix
@@ -3,7 +3,6 @@
 {
   homeManagerModules = {
     gtk.enable = true;
-    mpv.enable = true;
     pocket-casts.enable = true;
     tmux-sessionizer.enable = true;
   };
diff --git a/home/opdavies/hosts/t480.nix b/home/opdavies/hosts/t480.nix
index 401f4069..538e87cd 100644
--- a/home/opdavies/hosts/t480.nix
+++ b/home/opdavies/hosts/t480.nix
@@ -3,7 +3,6 @@
 {
   homeManagerModules = {
     gtk.enable = true;
-    mpv.enable = true;
     newsboat.enable = true;
 
     notes = {
diff --git a/home/opdavies/hosts/t490.nix b/home/opdavies/hosts/t490.nix
index abeed88d..6f715836 100644
--- a/home/opdavies/hosts/t490.nix
+++ b/home/opdavies/hosts/t490.nix
@@ -3,7 +3,6 @@
 {
   homeManagerModules = {
     gtk.enable = true;
-    mpv.enable = true;
 
     notes = {
       enable = true;
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 7f0da9a5..de43d029 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -14,6 +14,7 @@
     ../../modules/mixins/flameshot.nix
     ../../modules/mixins/fonts.nix
     ../../modules/mixins/fzf.nix
+    ../../modules/mixins/mpv.nix
     ../../modules/mixins/phpactor
     ../../modules/mixins/pipewire.nix
     ../../modules/mixins/screenkey.nix
diff --git a/modules/home-manager/desktop/media/default.nix b/modules/home-manager/desktop/media/default.nix
index ea0a9ce9..c6eb78c9 100644
--- a/modules/home-manager/desktop/media/default.nix
+++ b/modules/home-manager/desktop/media/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./mpv.nix
     ./pocket-casts.nix
   ];
 }
diff --git a/modules/home-manager/desktop/media/mpv.nix b/modules/home-manager/desktop/media/mpv.nix
deleted file mode 100644
index cfbf4a97..00000000
--- a/modules/home-manager/desktop/media/mpv.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-{
-  options.homeManagerModules.mpv.enable = mkEnableOption "Enable mpv media player";
-
-  config = mkIf config.homeManagerModules.mpv.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/modules/mixins/mpv.nix b/modules/mixins/mpv.nix
new file mode 100644
index 00000000..d84f07ef
--- /dev/null
+++ b/modules/mixins/mpv.nix
@@ -0,0 +1,11 @@
+{
+  home-manager.users.opdavies.programs.mpv = {
+    enable = true;
+
+    # https://github.com/mpv-player/mpv/blob/master/etc/input.conf
+    bindings = {
+      "DOWN" = "add volume -5";
+      "UP" = "add volume 5";
+    };
+  };
+}