From 2a89d6587d5ee5d3151b5e5be05e152a539e78d0 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 18 Apr 2019 10:16:02 +0200
Subject: l syncs: use permown, use attrs

---
 lass/2configs/radio.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'lass/2configs/radio.nix')

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index d67d970f..521b3c05 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -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 = "0007";
+  };
 }
-- 
cgit v1.2.3


From da336abf88d620648580a8e0a25e2b31c7d110ff Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 18 Apr 2019 13:39:00 +0200
Subject: l radio: set new music directory

---
 lass/2configs/radio.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lass/2configs/radio.nix')

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 521b3c05..b26237c6 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"
-- 
cgit v1.2.3


From 8b3030a08d69317404470b96f097635b39be2027 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 18 Apr 2019 13:39:54 +0200
Subject: l radio: grant mpd access to music dir

---
 lass/2configs/radio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs/radio.nix')

diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index b26237c6..88899c55 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -255,6 +255,6 @@ in {
   krebs.permown."/home/radio/music/the_playlist" = {
     owner = "radio";
     group = "syncthing";
-    umask = "0007";
+    umask = "0002";
   };
 }
-- 
cgit v1.2.3