From 9123788cda843b46bc62cc4b5bcdf7bd4f51a69f Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 14 Jan 2024 12:54:45 +0000
Subject: [PATCH] Remove git-sync services, issues with using pass

Add git-sync as installed package to run syncing manually though

TODO consider an exec line in hyprland or something similar?
---
 home/accounts/pass.nix | 27 +++++++++------------------
 home/emacs.nix         | 21 +--------------------
 system/default.nix     |  1 +
 3 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/home/accounts/pass.nix b/home/accounts/pass.nix
index e5f87101..7a50c00d 100644
--- a/home/accounts/pass.nix
+++ b/home/accounts/pass.nix
@@ -16,23 +16,14 @@
       helper = "${pkgs.pass-git-helper}/bin/pass-git-helper";
     };
   };
-  services = {
-    gpg-agent = rec {
-      enable = true;
-      maxCacheTtl = 86400;
-      defaultCacheTtl = maxCacheTtl;
-      defaultCacheTtlSsh = maxCacheTtl;
-      pinentryFlavor = lib.mkDefault "curses";
-      extraConfig = ''
-        no-allow-external-cache
-      '';
-    };
-    git-sync = {
-      enable = true;
-      repositories.password-store = {
-        path = "${config.home.homeDirectory}/.password-store";
-        uri = "git+https://git.xenia.me.uk/xenia/pass.git";
-      };
-    };
+  services.gpg-agent = rec {
+    enable = true;
+    maxCacheTtl = 86400;
+    defaultCacheTtl = maxCacheTtl;
+    defaultCacheTtlSsh = maxCacheTtl;
+    pinentryFlavor = lib.mkDefault "curses";
+    extraConfig = ''
+      no-allow-external-cache
+    '';
   };
 }
diff --git a/home/emacs.nix b/home/emacs.nix
index 57ef507b..4cc3855d 100644
--- a/home/emacs.nix
+++ b/home/emacs.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ pkgs, ... }: {
   programs.emacs = {
     # Clone emacs config from https://git.xenia.me.uk/xenia/emacs.git
     enable = true;
@@ -102,23 +102,4 @@
         elfeed-tube-mpv
       ];
   };
-  services = {
-    git-sync = {
-      enable = true;
-      repositories = with config.xdg.userDirs; {
-        org = {
-          path = "${documents}/Org";
-          uri = "git+https://git.xenia.me.uk/xenia/org.git";
-        };
-        references = {
-          path = "${documents}/References";
-          uri = "git+https://git.xenia.me.uk/xenia/references.git";
-        };
-        elfeed = {
-          path = "${config.home.homeDirectory}/.elfeed";
-          uri = "git+https://git.xenia.me.uk/xenia/elfeed.git";
-        };
-      };
-    };
-  };
 }
diff --git a/system/default.nix b/system/default.nix
index 875067fc..9fb9f2ca 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -9,6 +9,7 @@
       libsecret
       gnumake
       git
+      git-sync
       pinentry
       zip
       unzip