Compare commits

...

5 Commits

Author SHA1 Message Date
xenofem 6c5c7f2b00 Revert "move sub-select.json to global config, remove home-manager dependency"
This reverts commit 0047c5f9be.
2023-04-23 02:19:36 -04:00
xenofem be5208856b Revert "fix mpv global config dir"
This reverts commit 6f73a7d50c.
2023-04-23 02:19:19 -04:00
xenofem 681260bdb6 Revert "adjust confdir patch for v0.35.1 rather than master"
This reverts commit 2c2216b8f4.
2023-04-23 02:19:17 -04:00
xenofem 4f950c6af9 Revert "better overriding of conf dir"
This reverts commit 00f5e1d285.
2023-04-23 02:19:15 -04:00
xenofem 32ab8865b6 Revert "adjust mpv flags to work with 22.11 or 23.05"
This reverts commit 3217f26b19.
2023-04-23 02:18:58 -04:00
2 changed files with 42 additions and 72 deletions

101
flake.nix
View File

@ -9,13 +9,12 @@
outputs = { self, nixpkgs, utils }: let
packages = utils.lib.eachDefaultSystem (system: let
pkgs = import nixpkgs { inherit system; };
mpvScript = { owner, repo, rev, sha256, scriptName, patches ? [] }: pkgs.stdenvNoCC.mkDerivation {
mpvScript = { owner, repo, rev, sha256, scriptName }: pkgs.stdenvNoCC.mkDerivation {
pname = repo;
version = builtins.substring 0 6 rev;
src = pkgs.fetchFromGitHub {
inherit owner repo rev sha256;
};
inherit patches;
dontBuild = true;
installPhase = ''
install -Dm644 ${scriptName} $out/share/mpv/scripts/${scriptName}
@ -29,9 +28,6 @@
rev = "5d2fb7ab73fc0e36d44109e75c9be26bd42084e2";
sha256 = "0dyh2kyvivj81lrkyqhc3czmi9hqjkh7xg8dqjnnr3kh3yn62dpi";
scriptName = "sub-select.lua";
patches = [
./sub-select-path.patch
];
};
packages.segment-linking = mpvScript {
@ -46,25 +42,8 @@
packages // rec {
overlays.default = final: prev: let
newScripts = packages.packages.${prev.system};
in rec {
mpv-unwrapped = prev.mpv-unwrapped.overrideAttrs (oldAttrs:
if oldAttrs ? wafConfigureFlags
then {
wafConfigureFlags = oldAttrs.wafConfigureFlags ++ [
"--confloaddir=/etc/mpv"
];
}
else if oldAttrs ? mesonFlags
then {
mesonFlags = oldAttrs.mesonFlags ++ [
"-Dsysconfdir=/etc"
];
}
else oldAttrs
);
mpv = prev.wrapMpv mpv-unwrapped {
scripts = builtins.attrValues newScripts;
};
in {
mpv = prev.mpv.override { scripts = builtins.attrValues newScripts; };
mpvScripts = prev.mpvScripts // newScripts;
};
@ -76,41 +55,45 @@
pkgs.mkvtoolnix
];
environment.etc."mpv/script-opts/sub-select.json".text = builtins.toJSON [
{
alang = "j[ap]n?";
slang = [ "eng?" "und" ];
blacklist = [ "sign" ];
condition = "not sub.forced";
}
{
alang = "eng?";
slang = "forced";
}
{
alang = "eng?";
slang = "eng?";
whitelist = [ "sign" "song" ];
}
{
alang = [ "eng?" "no" ];
slang = "no";
}
{
alang = "*";
slang = "eng?";
condition = "not sub.forced";
}
{
alang = "*";
slang = "und";
condition = "not sub.forced";
}
{
alang = "*";
slang = "forced";
}
];
home-manager.sharedModules = [ ({ config, ... }: {
config = lib.mkIf config.programs.mpv.enable {
xdg.configFile."mpv/script-opts/sub-select.json".text = builtins.toJSON [
{
alang = "j[ap]n?";
slang = [ "eng?" "und" ];
blacklist = [ "sign" ];
condition = "not sub.forced";
}
{
alang = "eng?";
slang = "forced";
}
{
alang = "eng?";
slang = "eng?";
whitelist = [ "sign" "song" ];
}
{
alang = [ "eng?" "no" ];
slang = "no";
}
{
alang = "*";
slang = "eng?";
condition = "not sub.forced";
}
{
alang = "*";
slang = "und";
condition = "not sub.forced";
}
{
alang = "*";
slang = "forced";
}
];
};
}) ];
};
};
}

View File

@ -1,13 +0,0 @@
diff --git a/sub-select.lua b/sub-select.lua
index f61025b..1d8edc8 100644
--- a/sub-select.lua
+++ b/sub-select.lua
@@ -73,7 +73,7 @@ local function type_check(val, t, required)
end
local function setup_prefs()
- local file = assert(io.open(mp.command_native({"expand-path", o.config}) .. "/sub-select.json"))
+ local file = assert(io.open(mp.command_native({"expand-path", o.config .. "/sub-select.json"})))
local json = file:read("*all")
file:close()
prefs = utils.parse_json(json)