nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity

mpd: refactor implementation (#6537)

Browse source 
Remove with lib, reorganize, cleanup conditionals, hide options that are
linux only from darwin.
This commit is contained in:
Austin Horstman 2025-02-27 11:56:56 -05:00 • committed by GitHub
parent 11e6d20803
commit cf3bf4f1b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 73 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

85
modules/services/mpd.nix
View file

@ -1,41 +1,11 @@
{ config, lib, pkgs, ... }:
with lib;
let
name = "mpd";
inherit (lib) mkIf mkOption types;
cfg = config.services.mpd;
mpdConf = pkgs.writeText "mpd.conf" ''
music_directory "${cfg.musicDirectory}"
playlist_directory "${cfg.playlistDirectory}"
${lib.optionalString (cfg.dbFile != null) ''
db_file "${cfg.dbFile}"
''}
${lib.optionalString (pkgs.stdenv.hostPlatform.isDarwin) ''
log_file "${config.home.homeDirectory}/Library/Logs/mpd/log.txt"
''}
state_file "${cfg.dataDir}/state"
sticker_file "${cfg.dataDir}/sticker.sql"
${optionalString (cfg.network.listenAddress != "any")
''bind_to_address "${cfg.network.listenAddress}"''}
${optionalString (cfg.network.port != 6600)
''port "${toString cfg.network.port}"''}
${cfg.extraConfig}
'';
in {
###### interface
options = {
services.mpd = {
enable = mkOption {
type = types.bool;
default = false;
@ -55,7 +25,7 @@ in {
musicDirectory = mkOption {
type = with types; either path str;
defaultText = literalExpression ''
defaultText = lib.literalExpression ''
''${home.homeDirectory}/music if state version < 22.11
''${xdg.userDirs.music} if xdg.userDirs.enable == true
undefined otherwise
@ -103,7 +73,7 @@ in {
dataDir = mkOption {
type = types.path;
default = "${config.xdg.dataHome}/${name}";
default = "${config.xdg.dataHome}/mpd";
defaultText = "$XDG_DATA_HOME/mpd";
apply = toString; # Prevent copies to Nix store.
description = ''
@ -116,6 +86,8 @@ in {
startWhenNeeded = mkOption {
type = types.bool;
default = false;
visible = pkgs.stdenv.hostPlatform.isLinux;
readOnly = pkgs.stdenv.hostPlatform.isDarwin;
description = ''
Enable systemd socket activation. This is only supported on Linux.
'';
@ -152,25 +124,45 @@ in {
'';
};
};
};
###### implementation
config = let
mpdConf = pkgs.writeText "mpd.conf" (''
music_directory "${cfg.musicDirectory}"
playlist_directory "${cfg.playlistDirectory}"
'' + lib.optionalString (cfg.dbFile != null) ''
db_file "${cfg.dbFile}"
'' + lib.optionalString (pkgs.stdenv.hostPlatform.isDarwin) ''
log_file "${config.home.homeDirectory}/Library/Logs/mpd/log.txt"
'' + ''
state_file "${cfg.dataDir}/state"
sticker_file "${cfg.dataDir}/sticker.sql"
config = mkIf cfg.enable {
services.mpd = mkMerge [
(mkIf (versionAtLeast config.home.stateVersion "22.11"
'' + lib.optionalString (cfg.network.listenAddress != "any") ''
bind_to_address "${cfg.network.listenAddress}"
'' + lib.optionalString (cfg.network.port != 6600) ''
port "${toString cfg.network.port}"
'' + lib.optionalString (cfg.extraConfig != "") ''
${cfg.extraConfig}
'');
in mkIf cfg.enable {
home.packages = [ cfg.package ];
services.mpd = lib.mkMerge [
(mkIf (lib.versionAtLeast config.home.stateVersion "22.11"
&& config.xdg.userDirs.enable) {
musicDirectory = mkOptionDefault config.xdg.userDirs.music;
musicDirectory = lib.mkOptionDefault config.xdg.userDirs.music;
})
(mkIf (versionOlder config.home.stateVersion "22.11") {
musicDirectory = mkOptionDefault "${config.home.homeDirectory}/music";
(mkIf (lib.versionOlder config.home.stateVersion "22.11") {
musicDirectory =
lib.mkOptionDefault "${config.home.homeDirectory}/music";
})
];
systemd.user.services.mpd = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
Unit = mkMerge [
systemd.user = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {
services.mpd = {
Unit = lib.mkMerge [
{
Description = "Music Player Daemon";
After = [ "network.target" "sound.target" ];
@ -189,7 +181,7 @@ in {
Service = {
Environment = [ "PATH=${config.home.profileDirectory}/bin" ];
ExecStart = "${cfg.package}/bin/mpd --no-daemon ${mpdConf} ${
escapeShellArgs cfg.extraArgs
lib.escapeShellArgs cfg.extraArgs
}";
Type = "notify";
ExecStartPre = ''
@ -197,7 +189,7 @@ in {
};
};
systemd.user.sockets.mpd = mkIf cfg.network.startWhenNeeded {
sockets.mpd = mkIf cfg.network.startWhenNeeded {
Socket = {
ListenStream = let
listen = if cfg.network.listenAddress == "any" then
@ -212,6 +204,7 @@ in {
Install = { WantedBy = [ "sockets.target" ]; };
};
};
launchd.agents.mpd = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
enable = true;
@ -223,7 +216,5 @@ in {
ProcessType = "Interactive";
};
};
home.packages = [ cfg.package ];
};
}

5
tests/modules/services/mpd/basic-configuration.conf
View file

@ -1,12 +1,7 @@
music_directory "/my/music/dir"
playlist_directory "/home/hm-user/.local/share/mpd/playlists"
db_file "/home/hm-user/.local/share/mpd/tag_cache"
state_file "/home/hm-user/.local/share/mpd/state"
sticker_file "/home/hm-user/.local/share/mpd/sticker.sql"
bind_to_address "127.0.0.1"

5
tests/modules/services/mpd/xdg-music-dir.conf
View file

@ -1,12 +1,7 @@
music_directory "/home/hm-user/Music"
playlist_directory "/home/hm-user/.local/share/mpd/playlists"
db_file "/home/hm-user/.local/share/mpd/tag_cache"
state_file "/home/hm-user/.local/share/mpd/state"
sticker_file "/home/hm-user/.local/share/mpd/sticker.sql"
bind_to_address "127.0.0.1"