From 0047c5f9bef20c2228566c3efac3413b9efb11b2 Mon Sep 17 00:00:00 2001 From: xenofem Date: Sat, 22 Apr 2023 23:57:43 -0400 Subject: [PATCH] move sub-select.json to global config, remove home-manager dependency --- flake.nix | 80 +++++++++++++++++++++---------------------- sub-select-path.patch | 13 +++++++ 2 files changed, 53 insertions(+), 40 deletions(-) create mode 100644 sub-select-path.patch diff --git a/flake.nix b/flake.nix index 19ea799..204716e 100644 --- a/flake.nix +++ b/flake.nix @@ -9,12 +9,13 @@ outputs = { self, nixpkgs, utils }: let packages = utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; - mpvScript = { owner, repo, rev, sha256, scriptName }: pkgs.stdenvNoCC.mkDerivation { + mpvScript = { owner, repo, rev, sha256, scriptName, patches ? [] }: 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} @@ -28,6 +29,9 @@ rev = "5d2fb7ab73fc0e36d44109e75c9be26bd42084e2"; sha256 = "0dyh2kyvivj81lrkyqhc3czmi9hqjkh7xg8dqjnnr3kh3yn62dpi"; scriptName = "sub-select.lua"; + patches = [ + ./sub-select-path.patch + ]; }; packages.segment-linking = mpvScript { @@ -55,45 +59,41 @@ pkgs.mkvtoolnix ]; - 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"; - } - ]; - }; - }) ]; + 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"; + } + ]; }; }; } diff --git a/sub-select-path.patch b/sub-select-path.patch new file mode 100644 index 0000000..9f6fb92 --- /dev/null +++ b/sub-select-path.patch @@ -0,0 +1,13 @@ +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)