diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-04-14 11:52:31 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-04-14 11:52:31 +0200 |
| commit | 406cb749db8eee88c3d74b04389d8a5dd0cb9ebe (patch) | |
| tree | db08c5f669fb86d973e7e991f238d93de5a0371c /pkgs/by-name | |
| parent | pkgs/mpp-beetrm: Migrate to `writeShellApplication` (diff) | |
| download | nixos-config-406cb749db8eee88c3d74b04389d8a5dd0cb9ebe.zip | |
pkgs/mpp-lyrics: Migrate to `writeShellApplication`
Diffstat (limited to 'pkgs/by-name')
| -rwxr-xr-x | pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh | 12 | ||||
| -rw-r--r-- | pkgs/by-name/mp/mpp-lyrics/package.nix | 17 |
2 files changed, 12 insertions, 17 deletions
diff --git a/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh b/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh index 004c67c7..178eb924 100755 --- a/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh +++ b/pkgs/by-name/mp/mpp-lyrics/mpp-lyrics.sh @@ -1,11 +1,11 @@ #!/usr/bin/env dash -# shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.1.2" . %SHELL_LIBRARY_PATH +die() { + echo "Error: $1" + exit 1 +} -( - cd "%MPD_MUSIC_DIR" || die "No music dir!" - exiftool "$(mpc --format '%file%' current)" -json | jq '.[0].Lyrics' -r | less -) +cd "$XDG_MUSIC_DIR" || die "No music dir!" +exiftool "$(mpc --format '%file%' current)" -json | jq '.[0].Lyrics' --raw-output | less # vim: ft=sh diff --git a/pkgs/by-name/mp/mpp-lyrics/package.nix b/pkgs/by-name/mp/mpp-lyrics/package.nix index 76b590c7..23979c14 100644 --- a/pkgs/by-name/mp/mpp-lyrics/package.nix +++ b/pkgs/by-name/mp/mpp-lyrics/package.nix @@ -1,23 +1,18 @@ { - sysLib, + writeShellApplication, + # Dependencies exiftool, mpc, jq, less, locale, # dependency of less - mpd_music_dir ? "\${XDG_MUSIC_DIR}", }: -sysLib.writeShellScript { +writeShellApplication { name = "mpp-lyrics"; - src = ./mpp-lyrics.sh; - generateCompletions = false; - keepPath = false; + text = builtins.readFile ./mpp-lyrics.sh; + inheritPath = false; - replacementStrings = { - MPD_MUSIC_DIR = mpd_music_dir; - }; - - dependencies = [ + runtimeInputs = [ exiftool mpc jq |