diff --git a/configs/cloud.nix b/configs/cloud.nix
index 4662dfe..571687d 100644
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -33,7 +33,10 @@
           "${cloud-dir}/syncthing/common".devices = [ "wilde" "manakish" ];
           "${cloud-dir}/syncthing/library".devices = [ "wilde" "manakish" "heym" ];
           "${cloud-dir}/syncthing/mundoiu".devices = [ "wilde" "manakish" "heym" ];
-          "${cloud-dir}/syncthing/music".devices = [ "wilde" "manakish" "heym" ];
+          "${cloud-dir}/syncthing/music" = {
+            devices = [ "wilde" "manakish" "heym" "zaatar" ];
+            id = "music";
+          };
           "${cloud-dir}/moodle" = {
             devices = [ "wilde" "toum" "manakish" ];
             id = "moodle-dl";
diff --git a/configs/tuna.nix b/configs/tuna.nix
index 3f14861..3a02b63 100644
--- a/configs/tuna.nix
+++ b/configs/tuna.nix
@@ -13,11 +13,23 @@ in
     <niveum/modules/tuna.nix>
   ];
 
-  services.mpdscribble = {
+  services.syncthing = let mpd-directory = config.services.mpd.dataDir; in {
     enable = true;
-    endpoints."last.fm" = {
-      username = "Sternenzone";
-      passwordFile = toString <system-secrets/lastfm.key>;
+    user = config.services.mpd.user; # config.users.extraUsers.moodle.name;
+    openDefaultPorts = true;
+    configDir = "${mpd-directory}/.config/syncthing";
+    dataDir = "${mpd-directory}/.config/syncthing";
+    declarative = rec {
+      cert = toString <system-secrets/syncthing/cert.pem>;
+      key = toString <system-secrets/syncthing/key.pem>;
+      devices = {
+        inherit ((import <niveum/lib>).syncthing.devices) wilde manakish heym;
+      };
+      folders.${config.services.mpd.musicDirectory} = {
+        devices = [ "heym" "wilde" "manakish" ];
+        id = "music";
+        type = "receiveonly";
+      };
     };
   };
 
diff --git a/lib/default.nix b/lib/default.nix
index e3d2818..1015b21 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -47,6 +47,7 @@ rec {
     heym.id = "HLQSG3D-WSKLA6S-MEYQ3EU-GDBGABE-PY53RQ6-SWQAP2I-Z5MVBVX-MYPJXAM";
     manakish.id = "AJVBWR2-VFFAGZF-7ZF5JAX-T63GMOG-NZ446WK-MC5E6WK-6X6Q2HE-QQA2JQ3";
     toum.id = "CBJQXFF-FMFGWFU-2J6FMPR-SRDTSGX-7NHOYOH-CQCABKF-KQJMRJC-SDE24Q4";
+    zaatar.id = "CGHO6LK-ZJBAXBD-UWI7AH3-BXYARE6-EUIM7PE-O2FUCOM-VCCRNCM-IG34WQ7";
   };
 
   ignorePaths = [