From b317fc17f00ea74fe2267950b3119dddddd78b09 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Sat, 16 Nov 2024 21:13:24 +0100
Subject: refactor(pkgs/mpc): Rename to `mpp`

Nixpkgs has renamed their `mpc-cli` package to just `mpc`, turning this
`mpc` package into an override for the official nixpkgs one. I think
being explicit about the fact, that `mpc` is wrapped is the best
solution here.
---
 modules/home.legacy/conf/beets/plugins/play/default.nix |  2 +-
 modules/home.legacy/conf/yambar/default.nix             |  2 +-
 modules/home.legacy/pkgs/default.nix                    | 16 +++++-----------
 3 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'modules')

diff --git a/modules/home.legacy/conf/beets/plugins/play/default.nix b/modules/home.legacy/conf/beets/plugins/play/default.nix
index f5bc3c9b..635848c0 100644
--- a/modules/home.legacy/conf/beets/plugins/play/default.nix
+++ b/modules/home.legacy/conf/beets/plugins/play/default.nix
@@ -5,7 +5,7 @@
   ...
 }: {
   programs.beets.settings.play = {
-    command = "${lib.getExe pkgs.mpc-cli} $args add";
+    command = "${lib.getExe pkgs.mpc} $args add";
     relative_to = config.services.mpd.musicDirectory;
 
     # Run the command with the returned paths as arguments
diff --git a/modules/home.legacy/conf/yambar/default.nix b/modules/home.legacy/conf/yambar/default.nix
index 007e7f25..72dcaa8e 100644
--- a/modules/home.legacy/conf/yambar/default.nix
+++ b/modules/home.legacy/conf/yambar/default.nix
@@ -29,7 +29,7 @@ in {
       else "";
 
     mpd_song_name_script = makeScript {
-      dependencies = builtins.attrValues {inherit (pkgs) mpc-cli;};
+      dependencies = builtins.attrValues {inherit (pkgs) mpc;};
       name = "mpd_song_name";
     };
 
diff --git a/modules/home.legacy/pkgs/default.nix b/modules/home.legacy/pkgs/default.nix
index ad77c5fb..2018805f 100644
--- a/modules/home.legacy/pkgs/default.nix
+++ b/modules/home.legacy/pkgs/default.nix
@@ -5,14 +5,8 @@
   nixosConfig,
   ...
 }:
+# TODO: Remove this whole file, and move each pkgs to a separate module. <2024-11-16>
 with pkgs; let
-  onlyShare = drv:
-    runCommand "${drv.name}-only-share" {} ''
-      mkdir -p $out
-      ln -s ${drv}/share $out/share
-    '';
-  mpc-cli-man = onlyShare mpc-cli;
-
   Gui = {
     Terminals = [
       # foot # wayland native terminal
@@ -126,9 +120,10 @@ with pkgs; let
 
       Listen = [
         spodi # Wrapper around `spotdl`.
-        ncmpc # mpd player client
-        mpc-cli-man # a cli mpd client (added via a wrapper script)
-        mpc # Wrapper around `mpc` that allows the usage of `mpc-{rm,lyrics,searchadd}` without the `-`
+        sort_song # Sorts songs in the current directory.
+
+        mpp # Wrapper around `mpc` that allows the usage of `mpc-{beetsrm,lyrics,searchadd}` (below) without the `-`
+
         # Removes the currently playing song from the disk and storage
         (mpc-beetrm.override {
           beets = config.programs.beets.package;
@@ -141,7 +136,6 @@ with pkgs; let
         (mpc-lyrics.override {
           mpd_music_dir = config.services.mpd.musicDirectory;
         })
-        sort_song # Sorts songs in the current directory.
       ];
     };
 
-- 
cgit 1.4.1