From 7a9dd4c83e988dfa148bf570deff4313881e44ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sun, 20 Sep 2020 23:29:59 +0200 Subject: [PATCH] feat: move google-drive over to google-drive-ocamlfuse because grive2 is broken --- configs/cloud.nix | 2 +- modules/google-drive.nix | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configs/cloud.nix b/configs/cloud.nix index 03f93e4..3cd922e 100644 --- a/configs/cloud.nix +++ b/configs/cloud.nix @@ -10,7 +10,7 @@ seafile.enable = true; google-drive = { enable = true; - directory = "${config.users.users.me.home}/cloud/gdrive"; + directory = "${config.users.users.me.home}/cloud/google"; }; }; diff --git a/modules/google-drive.nix b/modules/google-drive.nix index c0176f8..a657d9b 100644 --- a/modules/google-drive.nix +++ b/modules/google-drive.nix @@ -8,15 +8,17 @@ in { }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.grive2 ]; - systemd.user.services.google-drive = { description = "Google Drive synchronisation service"; after = [ "network.target" ]; wantedBy = [ "default.target" ]; - script = "${pkgs.grive2}/bin/grive -p ${cfg.directory}"; - startAt = "*:0/5"; - serviceConfig.Type = "oneshot"; + preStart = "mkdir -p ${cfg.directory}"; + script = "${pkgs.google-drive-ocamlfuse}/bin/google-drive-ocamlfuse ${cfg.directory}"; + preStop = "${pkgs.fuse}/bin/fusermount -u ${cfg.directory}"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; }; };