From 9e79181f9a7641f1df570822bdb3a1cbc17c0cd7 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Tue, 26 Sep 2023 09:41:03 +0100
Subject: [PATCH] Enable vdirsyncer service, fix metasync for contacts

---
 home/accounts/contact.nix | 2 +-
 home/accounts/default.nix | 4 ++++
 home/accounts/email.nix   | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/home/accounts/contact.nix b/home/accounts/contact.nix
index f45bee2b..9dac2c67 100644
--- a/home/accounts/contact.nix
+++ b/home/accounts/contact.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
+  programs.vdirsyncer.enable = true;
   accounts.contact = {
     basePath = ".contact";
     accounts = {
@@ -19,7 +20,6 @@
         vdirsyncer = {
           enable = true;
           collections = [ "from a" ];
-          metadata = [ "color" "displayname" ];
         };
       };
     };
diff --git a/home/accounts/default.nix b/home/accounts/default.nix
index 43dbc6ac..d8917c6a 100644
--- a/home/accounts/default.nix
+++ b/home/accounts/default.nix
@@ -2,4 +2,8 @@
 
 {
   imports = [ ./email.nix ./calendar.nix ./contact.nix ];
+  services = {
+    mbsync.enable = true;
+    vdirsyncer.enable = true;
+  };
 }
diff --git a/home/accounts/email.nix b/home/accounts/email.nix
index f5d36e68..164a164b 100644
--- a/home/accounts/email.nix
+++ b/home/accounts/email.nix
@@ -13,7 +13,6 @@
     msmtp.enable = true;
     mu.enable = true;
   };
-  services.mbsync.enable = true;
   accounts.email = {
     maildirBasePath = ".mail";
     accounts = let realName = "Evie Litherland-Smith";