diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index b6481170..ee951ff9 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -9,9 +9,19 @@
   };
   services.git-sync = {
     enable = true;
-    repositories.org = {
-      path = "${config.home.homeDirectory}/Org";
-      uri = "git+https://git.xenia.me.uk/xenia/Org.git";
+    repositories = with config.home; {
+      org = {
+        path = "${homeDirectory}/Org";
+        uri = "git+https://git.xenia.me.uk/xenia/Org.git";
+      };
+      notmuch = {
+        path = "${homeDirectory}/.notmuch";
+        uri = "git+https://git.xenia.me.uk/xenia/notmuch.git";
+      };
+      elfeed = {
+        path = "${homeDirectory}/.elfeed";
+        uri = "git+https://git.xenia.me.uk/xenia/elfeed.git";
+      };
     };
   };
   home = {
diff --git a/services/syncthing/default.nix b/services/syncthing/default.nix
index 0ffa2312..8d57f062 100644
--- a/services/syncthing/default.nix
+++ b/services/syncthing/default.nix
@@ -22,18 +22,6 @@ in {
           "I366QNQ-D3FTDRX-RNOTXMW-YITZXOF-DSCDMQD-63Q72LI-ME2Y4HZ-T34RMQK";
       };
       folders = {
-        "Elfeed" = {
-          inherit devices;
-          id = "hnnxy-lb5af";
-          path = "${dataDir}/.elfeed";
-          ignorePerms = true;
-        };
-        "Notmuch" = {
-          inherit devices;
-          id = "yiaiy-xrnse";
-          path = "${dataDir}/.notmuch";
-          ignorePerms = true;
-        };
         "Pictures" = {
           inherit devices;
           id = "ziuj8-rm6dn";