From 460cc67f98349c0891cf62ebb0f9c2094c1c2c8d Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 9 Aug 2024 22:44:48 +0200 Subject: fix(pkgs/lyrics): Make the music dir configurable --- pkgs/by-name/ly/lyrics/lyrics.sh | 2 +- pkgs/by-name/ly/lyrics/package.nix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs/by-name') diff --git a/pkgs/by-name/ly/lyrics/lyrics.sh b/pkgs/by-name/ly/lyrics/lyrics.sh index 02a147c8..004c67c7 100755 --- a/pkgs/by-name/ly/lyrics/lyrics.sh +++ b/pkgs/by-name/ly/lyrics/lyrics.sh @@ -4,7 +4,7 @@ SHELL_LIBRARY_VERSION="2.1.2" . %SHELL_LIBRARY_PATH ( - cd "$XDG_MUSIC_DIR" || die "No music dir!" + cd "%MPD_MUSIC_DIR" || die "No music dir!" exiftool "$(mpc --format '%file%' current)" -json | jq '.[0].Lyrics' -r | less ) diff --git a/pkgs/by-name/ly/lyrics/package.nix b/pkgs/by-name/ly/lyrics/package.nix index 041eed96..d83057ce 100644 --- a/pkgs/by-name/ly/lyrics/package.nix +++ b/pkgs/by-name/ly/lyrics/package.nix @@ -5,12 +5,18 @@ jq, less, locale, # dependency of less + mpd_music_dir ? "\${XDG_MUSIC_DIR}", }: sysLib.writeShellScript { name = "lyrics"; src = ./lyrics.sh; generateCompletions = false; keepPath = false; + + replacementStrings = { + MPD_MUSIC_DIR = mpd_music_dir; + }; + dependencies = [ exiftool mpc-cli -- cgit 1.4.1