From 367ac8e689f7de5e55e0d71e7fae454a47eed5d1 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 22 Oct 2023 07:52:24 +0100
Subject: [PATCH] Fix path setting

Move Legion syncthing path to be default like everything else
---
 hosts/Legion/configuration.nix | 35 ++++++++++++++++------------------
 services/syncthing/default.nix |  2 +-
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/hosts/Legion/configuration.nix b/hosts/Legion/configuration.nix
index 4a26dc8b..a1a37c89 100644
--- a/hosts/Legion/configuration.nix
+++ b/hosts/Legion/configuration.nix
@@ -28,27 +28,24 @@ in {
       allowedUDPPorts = [ port ];
     };
   };
-  services = {
-    syncthing.dataDir = "/var/lib/syncthing";
-    openvpn = {
-      restartAfterSleep = true;
-      servers.xenia.config = ''
-        dev ${vpn-dev}
-        proto udp
-        ifconfig 10.8.0.1 10.8.0.2
-        secret ${client-key}
-        port ${toString port}
+  services.openvpn = {
+    restartAfterSleep = true;
+    servers.xenia.config = ''
+      dev ${vpn-dev}
+      proto udp
+      ifconfig 10.8.0.1 10.8.0.2
+      secret ${client-key}
+      port ${toString port}
 
-        cipher AES-256-CBC
-        auth-nocache
+      cipher AES-256-CBC
+      auth-nocache
 
-        comp-lzo
-        keepalive 10 60
-        ping-timer-rem
-        persist-tun
-        persist-key
-      '';
-    };
+      comp-lzo
+      keepalive 10 60
+      ping-timer-rem
+      persist-tun
+      persist-key
+    '';
   };
 
   environment.etc."openvpn/client.ovpn" = {
diff --git a/services/syncthing/default.nix b/services/syncthing/default.nix
index ae84d4a0..81307dde 100644
--- a/services/syncthing/default.nix
+++ b/services/syncthing/default.nix
@@ -5,7 +5,7 @@ in {
     inherit user;
     inherit (config.users.users.${user}) group;
     enable = true;
-    dataDir = lib.mkDefault "/home/${user}";
+    dataDir = "/home/${user}";
     systemService = true;
     openDefaultPorts = true;
     settings = {