From 6d39e330591d0a32e02d1b2f65a04198ad5e28ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Mon, 9 Dec 2019 08:05:14 +0100
Subject: [PATCH] fix(cloud)

---
 configs/cloud.nix        |  5 ++---
 modules/google-drive.nix | 11 ++++-------
 modules/seafile.nix      |  1 +
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/configs/cloud.nix b/configs/cloud.nix
index dde3d56..5cc416d 100644
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -9,10 +9,9 @@
   niveum = {
     dropbox.enable = true;
     seafile.enable = true;
-    google-drive = rec {
+    google-drive = {
       enable = true;
-      directory = "${user.home}/cloud/gdrive";
-      user = config.users.users.me;
+      directory = "${config.users.users.me.home}/cloud/gdrive";
     };
   };
 
diff --git a/modules/google-drive.nix b/modules/google-drive.nix
index 5139d32..d3f6d21 100644
--- a/modules/google-drive.nix
+++ b/modules/google-drive.nix
@@ -6,7 +6,6 @@ in
   options.niveum.google-drive = {
     enable = mkEnableOption "Google Drive";
     directory = mkOption { type = types.path; };
-    user = mkOption { type = types.attrs; };
   };
 
   config = mkIf cfg.enable {
@@ -14,15 +13,13 @@ in
       pkgs.grive2
     ];
 
-    systemd.services.google-drive = {
+    systemd.user.services.google-drive = {
       description = "Google Drive synchronisation service";
-      after = [ "network-online.target" ];
+      after = [ "network.target" ];
+      wantedBy = [ "default.target" ];
       script = "${pkgs.grive2}/bin/grive -p ${cfg.directory}";
       startAt = "*:0/5";
-      serviceConfig = {
-        Type = "oneshot";
-        User = cfg.user.name;
-      };
+      serviceConfig.Type = "oneshot";
     };
   };
 
diff --git a/modules/seafile.nix b/modules/seafile.nix
index 3c9e12a..163a364 100644
--- a/modules/seafile.nix
+++ b/modules/seafile.nix
@@ -13,6 +13,7 @@ in {
       wantedBy = [ "default.target" ];
       script = "${pkgs.seafile-client}/bin/seafile-applet";
       serviceConfig = {
+        Type = "forking";
         Restart = "always";
       };
     };