From 718877b329826d65fab00855e6052fbce88b321d Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 16 Oct 2023 23:12:26 +0200
Subject: [PATCH] machines/newton: migrate from /srv to /data

---
 machines/newton/disko-config.nix |  4 ++--
 machines/newton/services.nix     |  6 +++---
 machines/newton/syncthing.nix    | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/machines/newton/disko-config.nix b/machines/newton/disko-config.nix
index 29b110a..e72dbca 100644
--- a/machines/newton/disko-config.nix
+++ b/machines/newton/disko-config.nix
@@ -52,12 +52,12 @@
             mountpoint = "/";
           };
         };
-        srv = {
+        data = {
           size = "350G";
           content = {
             type = "filesystem";
             format = "ext4";
-            mountpoint = "/srv";
+            mountpoint = "/data";
           };
         };
         swap = {
diff --git a/machines/newton/services.nix b/machines/newton/services.nix
index 0206437..d368fe4 100644
--- a/machines/newton/services.nix
+++ b/machines/newton/services.nix
@@ -60,7 +60,7 @@ in
     # music streaming server
     navidrome = {
       enable = true;
-      musicFolder = "/srv/data/music";
+      musicFolder = "/data/music";
     };
     # self-hosted cloud
     nextcloud = {
@@ -73,7 +73,7 @@ in
       enable = true;
       passwordFile = secrets."paperless/password".path;
       extraConfig.PAPERLESS_ADMIN_USER = "felix";
-      mediaDir = "/srv/data/docs";
+      mediaDir = "/data/docs";
     };
     # RSS aggregator and reader
     freshrss = {
@@ -97,7 +97,7 @@ in
     photoprism = {
       enable = true;
       passwordFile = secrets."photoprism/password".path;
-      originalsPath = "/srv/data/photos";
+      originalsPath = "/data/photos";
       settings = {
         PHOTOPRISM_ADMIN_USER = "felix";
         PHOTOPRISM_SPONSOR = "true";
diff --git a/machines/newton/syncthing.nix b/machines/newton/syncthing.nix
index 32c68ae..d8a2710 100644
--- a/machines/newton/syncthing.nix
+++ b/machines/newton/syncthing.nix
@@ -5,11 +5,11 @@
 
   # make sure folders exist writable
   systemd.tmpfiles.rules = [
-    "d /srv/data/ 0755 syncthing syncthing"
-    "d /srv/data/computer 0755 syncthing syncthing"
-    "d /srv/data/phone 0755 syncthing syncthing"
-    "d /srv/data/music 0755 syncthing syncthing"
-    "d /srv/data/photos 0755 syncthing syncthing"
+    "d /data/ 0755 syncthing syncthing"
+    "d /data/computer 0755 syncthing syncthing"
+    "d /data/phone 0755 syncthing syncthing"
+    "d /data/music 0755 syncthing syncthing"
+    "d /data/photos 0755 syncthing syncthing"
   ];
 
   services.syncthing = {
@@ -37,7 +37,7 @@
     folders = {
       "Computer" = {
         id = "djdxo-1akub";
-        path = "/srv/data/computer";
+        path = "/data/computer";
         devices = [
           "thinkman"
           "birdman"
@@ -46,7 +46,7 @@
       };
       "Phone" = {
         id = "4hds7-gpypp";
-        path = "/srv/data/phone";
+        path = "/data/phone";
         devices = [
           "thinkman"
           "birdman"
@@ -55,7 +55,7 @@
       };
       "Music" = {
         id = "mphdq-n6q7y";
-        path = "/srv/data/music";
+        path = "/data/music";
         watch = false;
         devices = [
           "thinkman"
@@ -65,7 +65,7 @@
       };
       "Pictures" = {
         id = "cujyo-yiabu";
-        path = "/srv/data/photos";
+        path = "/data/photos";
         watch = false;
         devices = [
           "thinkman"