diff options
| author | tv <tv@krebsco.de> | 2019-04-19 16:39:05 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2019-04-19 16:39:05 +0200 |
| commit | d825d2db8796a0d19f22eba240a2e49213cf01e2 (patch) | |
| tree | b7104f1b790ae0446fd44b1aad4c22f1c425af6d /lass/2configs/radio.nix | |
| parent | 5fbe320b9173b1ef0725a79548f34f967ad16130 (diff) | |
| parent | 6c719f03c1a5533b43957d3039b4aed5f5bd8b42 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs/radio.nix')
| -rw-r--r-- | lass/2configs/radio.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix index d67d970f8..88899c554 100644 --- a/lass/2configs/radio.nix +++ b/lass/2configs/radio.nix @@ -10,7 +10,7 @@ let source-password = import <secrets/icecast-source-pw>; add_random = pkgs.writeDashBin "add_random" '' - ${pkgs.mpc_cli}/bin/mpc add "$(${pkgs.mpc_cli}/bin/mpc ls | shuf -n1)" + ${pkgs.mpc_cli}/bin/mpc add "$(${pkgs.mpc_cli}/bin/mpc ls the_playlist/music | grep '\.ogg$' | shuf -n1)" ''; skip_track = pkgs.writeDashBin "skip_track" '' @@ -57,7 +57,7 @@ in { services.mpd = { enable = true; group = "radio"; - musicDirectory = "/home/radio/the_playlist/music"; + musicDirectory = "/home/radio/music"; extraConfig = '' log_level "default" auto_update "yes" @@ -248,10 +248,13 @@ in { alias ${html}; ''; }; - krebs.syncthing.folders = [ - { id = "the_playlist"; path = "/home/radio/music/the_playlist"; peers = [ "mors" "phone" "prism" ]; } - ]; - lass.ensure-permissions = [ - { folder = "/home/radio/music/the_playlist"; owner = "radio"; group = "syncthing"; } - ]; + krebs.syncthing.folders."the_playlist" = { + path = "/home/radio/music/the_playlist"; + peers = [ "mors" "phone" "prism" ]; + }; + krebs.permown."/home/radio/music/the_playlist" = { + owner = "radio"; + group = "syncthing"; + umask = "0002"; + }; } |