Skip to content

Commit

Permalink
beets: add mpdIntegration
Browse files Browse the repository at this point in the history
Allow configuration of mpdstats and mpdupdate plugins for Beets using
Home Manager.

Signed-off-by: Sefa Eyeoglu <[email protected]>
  • Loading branch information
Scrumplex committed Mar 9, 2023
1 parent 36999b8 commit 0892cb0
Show file tree
Hide file tree
Showing 9 changed files with 128 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ Makefile @thiagokokada

/modules/programs/bat.nix @marsam

/modules/programs/beets.nix @rycee
/modules/programs/beets.nix @rycee @Scrumplex
/tests/modules/programs/beets @Scrumplex

/modules/programs/bottom.nix @polykernel
/tests/modules/programs/bottom @polykernel
Expand Down
65 changes: 59 additions & 6 deletions modules/programs/beets.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,28 @@ let

yamlFormat = pkgs.formats.yaml { };

mpdIntegrationOpts = with types;
submodule {
options = {
enableStats = mkEnableOption "mpdstats plugin and service";
enableUpdate = mkEnableOption "mpdupdate plugin";
host = mkOption {
type = str;
default = "localhost";
description = "Host mpdstats will connect to";
example = "10.0.0.42";
};
port = mkOption {
type = int;
default = config.services.mpd.network.port;
description = "Port mpdstats will connect to";
example = "6600";
};
};
};

in {
meta.maintainers = [ maintainers.rycee ];
meta.maintainers = with maintainers; [ rycee Scrumplex ];

options = {
programs.beets = {
Expand Down Expand Up @@ -48,13 +68,46 @@ in {
<filename>$XDG_CONFIG_HOME/beets/config.yaml</filename>
'';
};

mpdIntegration = mkOption {
type = mpdIntegrationOpts;
description = "Configuration for MPD related plugins";
example = literalExpression ''
{
enableStats = true;
}
'';
};
};
};

config = mkIf cfg.enable {
home.packages = [ cfg.package ];
config = mkIf cfg.enable (mkMerge [
{
home.packages = [ cfg.package ];

xdg.configFile."beets/config.yaml".source =
yamlFormat.generate "beets-config" cfg.settings;
};
xdg.configFile."beets/config.yaml".source =
yamlFormat.generate "beets-config" cfg.settings;
}
(mkIf (cfg.mpdIntegration.enableStats || cfg.mpdIntegration.enableUpdate) {
programs.beets.settings.mpd = {
host = cfg.mpdIntegration.host;
port = cfg.mpdIntegration.port;
};
})
(mkIf cfg.mpdIntegration.enableStats {
programs.beets.settings.plugins = [ "mpdstats" ];

systemd.user.services."beets-mpdstats" = {
Unit = {
Description = "Beets MPDStats daemon";
After = [ "mpd.service" ];
Requires = [ "mpd.service" ];
};
Service.ExecStart = "${cfg.package}/bin/beet mpdstats";
};
})
(mkIf cfg.mpdIntegration.enableUpdate {
programs.beets.settings.plugins = [ "mpdupdate" ];
})
]);
}
1 change: 1 addition & 0 deletions tests/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ import nmt {
./modules/programs/autojump
./modules/programs/bash
./modules/programs/bat
./modules/programs/beets
./modules/programs/bottom
./modules/programs/broot
./modules/programs/browserpass
Expand Down
4 changes: 4 additions & 0 deletions tests/modules/programs/beets/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
beets-mpdstats = ./mpdstats.nix;
beets-mpdupdate = ./mpdupdate.nix;
}
7 changes: 7 additions & 0 deletions tests/modules/programs/beets/mpdstats-expected.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[Service]
ExecStart=@beets@/bin/beet mpdstats

[Unit]
After=mpd.service
Description=Beets MPDStats daemon
Requires=mpd.service
5 changes: 5 additions & 0 deletions tests/modules/programs/beets/mpdstats-expected.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
mpd:
host: localhost
port: 6600
plugins:
- mpdstats
25 changes: 25 additions & 0 deletions tests/modules/programs/beets/mpdstats.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ config, lib, pkgs, ... }:

{
config = {
home.stateVersion = "23.05";

programs.beets = {
enable = true;
package = config.lib.test.mkStubPackage { outPath = "@beets@"; };
mpdIntegration.enableStats = true;
};

nmt.script = ''
assertFileExists home-files/.config/beets/config.yaml
assertFileContent \
home-files/.config/beets/config.yaml \
${./mpdstats-expected.yaml}
assertFileExists home-files/.config/systemd/user/beets-mpdstats.service
assertFileContent \
home-files/.config/systemd/user/beets-mpdstats.service \
${./mpdstats-expected.service}
'';
};
}
5 changes: 5 additions & 0 deletions tests/modules/programs/beets/mpdupdate-expected.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
mpd:
host: localhost
port: 6600
plugins:
- mpdupdate
20 changes: 20 additions & 0 deletions tests/modules/programs/beets/mpdupdate.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{ config, lib, pkgs, ... }:

{
config = {
home.stateVersion = "23.05";

programs.beets = {
enable = true;
package = config.lib.test.mkStubPackage { outPath = "@beets@"; };
mpdIntegration.enableUpdate = true;
};

nmt.script = ''
assertFileExists home-files/.config/beets/config.yaml
assertFileContent \
home-files/.config/beets/config.yaml \
${./mpdupdate-expected.yaml}
'';
};
}

0 comments on commit 0892cb0

Please sign in to comment.