Commit d5b62916edfa

Vincent Demeester <vincent@sbr.pm>
2026-01-27 20:20:25
fix(mpv): use mpv-unwrapped to avoid nixpkgs wrapper breakage
- Use mpv-unwrapped instead of mpv wrapper - Load mpris and modernz scripts via mpv.conf - Disable feishin temporarily (depends on broken mpv wrapper) - Update chick-group for abs-tui fix
main
1 parent 1682fa4
Changed files (4)
home
common
desktop
mpv.nix
overlays
default.nix
systems
kyushu
home.nix
flake.lock
home/common/desktop/mpv.nix
@@ -1,20 +1,19 @@
 { pkgs, ... }:
 {
-  # Bypass home-manager's mpv module due to evaluation issues
-  # See: https://github.com/nix-community/home-manager/issues/5530
+  # Use mpv-unwrapped and load scripts via config file
+  # Avoids nixpkgs mpv wrapper breakage
   home.packages = [
-    (pkgs.mpv.override {
-      scripts = with pkgs.mpvScripts; [
-        mpris
-        modernz
-      ];
-    })
+    pkgs.mpv-unwrapped
+    pkgs.mpvScripts.mpris
+    pkgs.mpvScripts.modernz
   ];
 
   # Configure mpv via xdg.configFile
   xdg.configFile."mpv/mpv.conf".text = ''
     hwdec=auto
     osc=no
+    scripts=${pkgs.mpvScripts.mpris}/share/mpv/scripts/mpris.so
+    scripts-append=${pkgs.mpvScripts.modernz}/share/mpv/scripts/modernz.lua
   '';
 
   xdg.configFile."mpv/input.conf".text = ''
overlays/default.nix
@@ -33,7 +33,8 @@ in
 
     # Use feishin from master to get mpv propagatedBuildInputs fix
     # https://github.com/NixOS/nixpkgs/pull/459155
-    inherit (final.master) feishin;
+    # FIXME: disabled until mpv wrapper is fixed in nixpkgs
+    # inherit (final.master) feishin;
   };
 
   # When applied, the unstable nixpkgs set (declared in the flake inputs) will
systems/kyushu/home.nix
@@ -43,7 +43,7 @@ in
 
     did
 
-    feishin # navidrome - works because mpv is already in PATH from mpv.nix
+    # feishin # navidrome - FIXME: broken due to mpv scripts issue in nixpkgs
 
     gops
     lazygit
flake.lock
@@ -124,11 +124,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769533439,
-        "narHash": "sha256-R3XaaVmJQPS/pvNkHuoQT3ZJ9DQk3wQqbEzB6TlNtYM=",
+        "lastModified": 1769541375,
+        "narHash": "sha256-fVwyKY7eOz32ac0BicddmBwa710mYoSSMMskG6nqdEQ=",
         "owner": "vdemeester",
         "repo": "chick-group",
-        "rev": "605cd61237123aec44b82a1e84e5233e47e2d0a1",
+        "rev": "b6e193aae68e9934870775ddf910466dad0d77aa",
         "type": "github"
       },
       "original": {