Merge remote-tracking branch 'prism/master' into head

1 files changed, 0 insertions, 28 deletions

diff --git a/lass/1systems/mors/config.nix b/lass/1systems/mors/config.nix
index 6d0d177ec..a3486cffa 100644
--- a/lass/1systems/mors/config.nix
+++ b/lass/1systems/mors/config.nix
@@ -52,34 +52,6 @@ with import <stockholm/lib>;
       ];
     }
     {
-      services.syncthing.declarative = {
-        devices.schasch.addresses = [ "schasch.r:22000" ];
-        folders = {
-          the_playlist = {
-            path = "/home/lass/tmp/the_playlist";
-            devices = [ "mors" "phone" "prism" "xerxes" ];
-          };
-          free_music = {
-            id = "mu9mn-zgvsw";
-            path = "/home/lass/tmp/free_music";
-            devices = [ "mors" "schasch" ];
-          };
-        };
-      };
-      krebs.permown = {
-        "/home/lass/tmp/free_music" = {
-          owner = "lass";
-          group = "syncthing";
-          umask = "0007";
-        };
-        "/home/lass/tmp/the_playlist" = {
-          owner = "lass";
-          group = "syncthing";
-          umask = "0007";
-        };
-      };
-    }
-    {
       services.nginx = {
         enable = true;
         virtualHosts.default = {