Re-enable git-sync service to sync org and library directories

git-sync service works now that I'm using libsecret for git auth.

Remove password-store from service, manage manually. Considering
switch to proton pass anyway.

Copy gpg and gpg-agent config to emacs/default.nix in case I switch
away from password-store.

system/home/emacs/default.nix

@@ -1,8 +1,28 @@
-{ config, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 {
   imports = [ ../shell/default.nix ];
   stylix.targets.emacs.enable = false;
-  services.emacs = {
+  services = {
+    gpg-agent = {
+      enable = true;
+      pinentryPackage = lib.mkDefault pkgs.pinentry-all;
+    };
+    git-sync.repositories = {
+      org = {
+        path = "${config.xdg.userDirs.documents}/org";
+        uri = "git+https://git.xenia.me.uk/pixelifytica/org.git";
+      };
+      library = {
+        path = "${config.xdg.userDirs.documents}/org";
+        uri = "git+https://git.xenia.me.uk/pixelifytica/library.git";
+      };
+    };
+    emacs = {
       enable = true;
       package = config.programs.emacs.finalPackage;
       defaultEditor = true;
@@ -10,7 +30,10 @@
       socketActivation.enable = true;
       startWithUserSession = false;
     };
-  programs.emacs = {
+  };
+  programs = {
+    gpg.enable = true;
+    emacs = {
       # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git
       enable = true;
       package = pkgs.emacs29-pgtk;
@@ -57,6 +80,7 @@
           emacsql-sqlite
         ];
     };
+  };
   home.packages = with pkgs; [
     # Emacs requirements
     imagemagick

system/home/services/password-store/default.nix

@@ -5,7 +5,6 @@
   ...
 }:
 {
-  xdg.configFile."pass-git-helper/git-pass-mapping.ini".source = ./git-pass-mapping.ini;
   programs = {
     gpg.enable = true;
     password-store = {
@@ -22,21 +21,8 @@
       };
     };
   };
-  services = {
-    gpg-agent =
-      let
-        ttl = 86400;
-      in
-      {
+  services.gpg-agent = {
     enable = true;
-        maxCacheTtl = ttl;
-        defaultCacheTtl = ttl;
-        defaultCacheTtlSsh = ttl;
     pinentryPackage = lib.mkDefault pkgs.pinentry-all;
   };
-    git-sync.repositories.password-store = {
-      path = "${config.home.homeDirectory}/.password-store";
-      uri = "git+https://git.xenia.me.uk/xenia/pass.git";
-    };
-  };
 }

system/home/services/password-store/git-pass-mapping.ini

@@ -1,6 +0,0 @@
-[DEFAULT]
-username_extractor=regex_search
-regex_username=^login: (.*)$
-
-[*]
-target=git/${host}

system/home/shell/git.nix

@@ -5,7 +5,7 @@
   ...
 }:
 {
-  services.git-sync.enable = false; # Can't find pass for some reason...
+  services.git-sync.enable = true;
   programs.git =
     let
       package = pkgs.git.override {