From 6efbedbe7d1dc25ea16aaabd6c45cb7142b22a9b Mon Sep 17 00:00:00 2001
From: ItsDrike <itsdrike@protonmail.com>
Date: Mon, 24 Jun 2024 16:54:45 +0200
Subject: [PATCH] Use home-manager native mpv program options

---
 home/packages/gui/default.nix            |  1 -
 home/packages/gui/mpv.nix                | 55 ------------------------
 home/programs/graphical/apps/default.nix |  1 +
 home/programs/graphical/apps/mpv.nix     | 51 ++++++++++++++++++++++
 4 files changed, 52 insertions(+), 56 deletions(-)
 delete mode 100644 home/packages/gui/mpv.nix
 create mode 100644 home/programs/graphical/apps/mpv.nix

diff --git a/home/packages/gui/default.nix b/home/packages/gui/default.nix
index 73bb692..bba9445 100644
--- a/home/packages/gui/default.nix
+++ b/home/packages/gui/default.nix
@@ -4,7 +4,6 @@ _: {
     ./stremio.nix
     ./nomacs.nix
     ./qbittorrent.nix
-    ./mpv.nix
     ./obs.nix
     ./qimgv.nix
   ];
diff --git a/home/packages/gui/mpv.nix b/home/packages/gui/mpv.nix
deleted file mode 100644
index 7518265..0000000
--- a/home/packages/gui/mpv.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  lib,
-  pkgs,
-  osConfig,
-  ...
-}: let
-  inherit (lib) mkIf;
-
-  cfg = osConfig.myOptions.home-manager.programs.applications.mpv;
-in {
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      mpv
-    ];
-
-    xdg.configFile = {
-      "mpv/mpv.conf".text = ''
-        loop=yes
-      '';
-
-      "mpv/input.conf".text = ''
-        # Vim keys seeking
-        l seek 5
-        h seek -5
-        j seek -60
-        k seek 60
-
-        # Set A-B Loop key to g, since l was rebound
-        g ab-loop
-
-        # Swap i and I, use lowercase for toggle
-        i script-binding stats/display-stats-toggle
-        I script-binding stats/display-stats
-
-        UP add volume 2
-        DOWN add volume -2
-
-        # Zooming
-        -           add video-zoom -.25
-        +           add video-zoom .25
-
-        # Moving/panning video
-        kp8         add video-pan-y .05
-        kp6         add video-pan-x -.05
-        kp2         add video-pan-y -.05
-        kp4         add video-pan-x .05
-        kp5         set video-pan-x 0; set video-pan-y 0; set video-zoom 0
-
-        # Rotation
-        ctrl+r      cycle_values video-rotate "90" "180" "270" "0"
-      '';
-    };
-  };
-}
-
diff --git a/home/programs/graphical/apps/default.nix b/home/programs/graphical/apps/default.nix
index 78d7bea..42e4049 100644
--- a/home/programs/graphical/apps/default.nix
+++ b/home/programs/graphical/apps/default.nix
@@ -3,5 +3,6 @@ _: {
     ./spotify
     ./vesktop
     ./webcord
+    ./mpv.nix
   ];
 }
diff --git a/home/programs/graphical/apps/mpv.nix b/home/programs/graphical/apps/mpv.nix
new file mode 100644
index 0000000..91d5526
--- /dev/null
+++ b/home/programs/graphical/apps/mpv.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  pkgs,
+  osConfig,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = osConfig.myOptions.home-manager.programs.applications.mpv;
+in {
+  config = mkIf cfg.enable {
+    programs.mpv = {
+      enable = true;
+
+      config = {
+        loop = "yes";
+      };
+
+      bindings = {
+        l = "seek 5";
+        h = "seek -5";
+        j = "seek -60";
+        k = "seek 60";
+
+        # Set A-B Loop key to g, since l was rebound
+        g = "ab-loop";
+
+        # Swap i and I, use lowercase for toggle
+        i = "script-binding stats/display-stats-toggle";
+        I = "script-binding stats/display-stats";
+
+        UP = "add volume 2";
+        DOWN = "add volume -2";
+
+        # Zooming
+        "-" = "add video-zoom -.25";
+        "+" = "add video-zoom .25";
+
+        # Moving/panning video
+        kp8 = "add video-pan-y .05";
+        kp6 = "add video-pan-x -.05";
+        kp2 = "add video-pan-y -.05";
+        kp4 = "add video-pan-x .05";
+        kp5 = "set video-pan-x 0; set video-pan-y 0; set video-zoom 0";
+
+        # Rotation
+        "ctrl+r" = "cycle_values video-rotate '90' '180' '270' '0'";
+      };
+    };
+  };
+}