From 2566c0b44e49bb8d99c788f4a69714f10591ed28 Mon Sep 17 00:00:00 2001
From: nevaforget <dom@moonarch.de>
Date: Fri, 24 Apr 2026 17:52:19 +0200
Subject: [PATCH] refactor(moonarch-git): own mpv.conf directly, drop
 staging+install hook
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Install mpv.conf straight to /etc/mpv/mpv.conf in package(), remove
the /usr/share/moonarch/mpv/ staging and the post_install copy.
modernz.conf is no longer shipped — overrides moved into mpv.conf
via script-opts-append.
---
 moonarch-git/PKGBUILD         | 7 ++-----
 moonarch-git/moonarch.install | 6 ------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/moonarch-git/PKGBUILD b/moonarch-git/PKGBUILD
index 51fb367..377ddbd 100644
--- a/moonarch-git/PKGBUILD
+++ b/moonarch-git/PKGBUILD
@@ -195,11 +195,8 @@ package() {
     install -Dm644 defaults/xdg/swaync/style.css \
         "$pkgdir/usr/share/moonarch/swaync/style.css"
 
-    # --- mpv configs (deployed by .install, modernz.conf owned by mpv-modernz-git) ---
-    install -Dm644 defaults/etc/mpv/mpv.conf \
-        "$pkgdir/usr/share/moonarch/mpv/mpv.conf"
-    install -Dm644 defaults/etc/mpv/script-opts/modernz.conf \
-        "$pkgdir/usr/share/moonarch/mpv/modernz.conf"
+    # --- mpv config (owned by moonarch-git; ModernZ color overrides via script-opts-append) ---
+    install -Dm644 defaults/etc/mpv/mpv.conf "$pkgdir/etc/mpv/mpv.conf"
 
     # --- Reference configs for greetd/moongreet (deployed by .install, not owned) ---
     install -Dm644 defaults/etc/greetd/config.toml \
diff --git a/moonarch-git/moonarch.install b/moonarch-git/moonarch.install
index 4aae059..6bddee1 100644
--- a/moonarch-git/moonarch.install
+++ b/moonarch-git/moonarch.install
@@ -29,12 +29,6 @@ post_install() {
     cp /usr/share/moonarch/swaync/config.json /etc/xdg/swaync/config.json
     cp /usr/share/moonarch/swaync/style.css /etc/xdg/swaync/style.css
 
-    # Deploy mpv configs (modernz.conf owned by mpv-modernz-git, overwrite deliberately)
-    install -Dm644 /usr/share/moonarch/mpv/mpv.conf /etc/mpv/mpv.conf
-    if [ -d /etc/mpv/script-opts ]; then
-        cp /usr/share/moonarch/mpv/modernz.conf /etc/mpv/script-opts/modernz.conf
-    fi
-
     # Deploy Walker config override to skel and existing user homes.
     # Only copies if user has no config yet — never overwrites manual edits.
     install -Dm644 /usr/share/moonarch/walker-config.toml \