More cleanin

home-mail.nix

@@ -1,43 +1,6 @@
 { pkgs, ... }:
 
 {
-  home.file.aerc-accounts = {
-    target = ".config/aerc/accounts.conf";
-    text = ''[FastMail]
-source = maildir://~/Mail/FastMail
-from = "Dustin Swan <dustin@dustinswan.com>"
-outgoing = ${builtins.getEnv "HOME"}/.nix-profile/bin/msmtp --read-envelope-from
-'';
-#     text = ''[FastMail]
-# source = imaps://dustinswan%40fastmail.com@mail.messagingengine.com:993
-# from = "Dustin Swan <dustin@dustinswan.com>"
-# outgoing = ${builtins.getEnv "HOME"}/.nix-profile/bin/msmtp --read-envelope-from
-# sourc-cred-cmd = "gpg -dq ${builtins.getEnv "HOME"}/.dustinswan@fastmail.com-password.gpg"
-# '';
-  };
-
-  home.file.khard = {
-    target = ".config/khard/config";
-    text = ''[addressbooks]
-[[contacts]]
-path = ~/Contacts/Default'';
-  };
-
-  home.file.khal = {
-    target = ".config/khal/config";
-    text = ''[calendars]
-[[Fastmail]]
-path = ~/Calendars/*
-type = discover
-
-[locale]
-timeformat = %H:%M
-dateformat = %Y-%m-%d
-longdateformat = %Y-%m-%d
-datetimeformat = %Y-%m-%d %H:%M
-longdatetimeformat = %Y-%m-%d %H:%M'';
-  };
-
   programs.neomutt = {
     enable = true;
     sidebar.enable = true;
@@ -77,4 +40,83 @@ longdatetimeformat = %Y-%m-%d %H:%M'';
       };
     };
   };
+
+  home.file.aerc-accounts = {
+    target = ".config/aerc/accounts.conf";
+    text = ''[FastMail]
+source = maildir://~/Mail/FastMail
+from = "Dustin Swan <dustin@dustinswan.com>"
+outgoing = ${builtins.getEnv "HOME"}/.nix-profile/bin/msmtp --read-envelope-from
+'';
+#     text = ''[FastMail]
+# source = imaps://dustinswan%40fastmail.com@mail.messagingengine.com:993
+# from = "Dustin Swan <dustin@dustinswan.com>"
+# outgoing = ${builtins.getEnv "HOME"}/.nix-profile/bin/msmtp --read-envelope-from
+# sourc-cred-cmd = "gpg -dq ${builtins.getEnv "HOME"}/.dustinswan@fastmail.com-password.gpg"
+# '';
+  };
+
+  home.file.vdirsyncer = {
+    target = ".config/vdirsyncer/config";
+    text = ''[general]
+status_path = "~/.vdirsyncer/status/"
+
+[pair fastmail_contacts]
+a = "fastmail_contacts_local"
+b = "fastmail_contacts_remote"
+collections = ["from b"]
+conflict_resolution = "b wins"
+
+[storage fastmail_contacts_local]
+type = "filesystem"
+path = "~/Contacts/"
+fileext = ".vcf"
+
+[storage fastmail_contacts_remote]
+type = "carddav"
+url = "https://carddav.messagingengine.com/"
+username = "dustinswan@fastmail.com"
+password.fetch = ["command", "~/dotfiles/bin/decrypt-password", "dustinswan@fastmail.com"]
+
+[pair fastmail_calendar]
+a = "fastmail_calendar_local"
+b = "fastmail_calendar_remote"
+collections = ["from b"]
+conflict_resolution = "b wins"
+metadata = ["color", "displayname"]
+
+[storage fastmail_calendar_local]
+type = "filesystem"
+path = "~/Calendars/"
+fileext = ".ics"
+
+[storage fastmail_calendar_remote]
+type = "caldav"
+url = "https://caldav.messagingengine.com/"
+username = "dustinswan@fastmail.com"
+password.fetch = ["command", "~/dotfiles/bin/decrypt-password", "dustinswan@fastmail.com"]'';
+  };
+
+  home.file.khard = {
+    target = ".config/khard/config";
+    text = ''[addressbooks]
+[[contacts]]
+path = ~/Contacts/Default'';
+  };
+
+  home.file.khal = {
+    target = ".config/khal/config";
+    text = ''[calendars]
+[[Fastmail]]
+path = ~/Calendars/*
+type = discover
+
+[locale]
+timeformat = %H:%M
+dateformat = %Y-%m-%d
+longdateformat = %Y-%m-%d
+datetimeformat = %Y-%m-%d %H:%M
+longdatetimeformat = %Y-%m-%d %H:%M'';
+  };
+
 }