From c55e4ee1b9aa2854afea37379df2490432ed2649 Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob.hinkle@jhink.org>
Date: Tue, 27 Sep 2022 09:07:52 -0400
Subject: [PATCH] Switch from privateemail to fastmail

---
 home/jacob.nix | 30 +++++++++++++++++++++++++-----
 secrets.yaml   |  7 ++++---
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/home/jacob.nix b/home/jacob.nix
index 71bf3e5..d9675e5 100644
--- a/home/jacob.nix
+++ b/home/jacob.nix
@@ -95,13 +95,25 @@
         create = "maildir";
       };
       notmuch.enable = false;
-      primary = true;
       realName = "Jacob Hinkle";
     };
     jhink = {
       address = "jacob.hinkle@jhink.org";
-      imap.host = "mail.privateemail.com";
-      smtp.host = "mail.privateemail.com";
+      primary = true;
+      imap = {
+        host = "imap.fastmail.com";
+        tls = {
+          enable = true;
+          useStartTls = false;
+        };
+      };
+      smtp = {
+        host = "smtp.fastmail.com";
+        tls = {
+          enable = true;
+          useStartTls = false;
+        };
+      };
       flavor = "plain";
       userName = "jacob.hinkle@jhink.org";
       passwordCommand = "${pkgs.coreutils}/bin/cat /run/secrets/email/jhink/password";
@@ -152,7 +164,9 @@
       };
     };
     lazygit.enable = true;
-    mbsync.enable = true;
+    mbsync = {
+      enable = true;
+    };
     neovim = {
       enable = true;
       extraConfig = ''
@@ -181,7 +195,9 @@
       ];
       vimAlias = true;
     };
-    #notmuch.enable = true;
+    notmuch = {
+      enable = true;
+    };
     qutebrowser = import ./qutebrowser.nix;
     rbw = {
       enable = true;
@@ -255,6 +271,10 @@
   };
 
   services = {
+    mbsync = {
+      enable = true;
+      verbose = true;
+    };
     spotifyd = {
       enable = true;
       settings = {
diff --git a/secrets.yaml b/secrets.yaml
index 3767dd3..71beec7 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -2,9 +2,10 @@ email:
     gmail:
         address: ENC[AES256_GCM,data:uWVgCX2nTVJn8HlEMKfU86DsVG9c0A==,iv:uLJk521DET65fizoUUKnLB325fNmSZNc3M9tNqjq2qg=,tag:zSlTWP3VYu0JR0FH0gdCHw==,type:str]
         password: ENC[AES256_GCM,data:DKB+h3jaX+BP,iv:kdc1NcYVLie3TRCf2qq5x8V3WaSKXKKHDqBDzjpQMDw=,tag:P1mmaKhPcX1yMUxI5I/uXA==,type:str]
+    #ENC[AES256_GCM,data:Otd/3wBbI7DCFsZwyg==,iv:rUajD3QRS4u1kdwpnfS8RQaNbB/WwtHnjDnsYkDe7Po=,tag:SS0lGIqLxmpdiJN1qvZoYg==,type:comment]
     jhink:
         address: ENC[AES256_GCM,data:nIuL4Ay343z3lzjiXKnSqPLsqZR96w==,iv:iKQCw/cj70q2Afuf97g3njkEcD5ux4HquXFTZ5K7xHo=,tag:BsnLC1MspQOsMN6qxtY4uQ==,type:str]
-        password: ENC[AES256_GCM,data:/F+gn/TaRqX+,iv:y6aNJb1zG+plXwcKilQLVFEnlemDJUV0PyIicbAD6BU=,tag:A2KPxqB4xZ2erFA/nstovg==,type:str]
+        password: ENC[AES256_GCM,data:YAa4rVh7I7AUAY8vcqM=,iv:lmx3zQzG0WSJcl1N6U3iAC3Akumcd/RHqL7XnmtYefM=,tag:+cJoktWtboMmzYUq1ROMqg==,type:str]
 pihole:
     webpassword: ENC[AES256_GCM,data:bqBbGE5M4LUukMh7vQA=,iv:YhKaO2WQq5Ar9aKitgRTbDU2Ld2Cdc0wmrcQZ92lztY=,tag:UGnerGhtQBjO+n4LobdSyg==,type:str]
 spotify:
@@ -59,8 +60,8 @@ sops:
             WVUwaEIwWTFFTExyT3hLSC9wODhJdGcKWsNIUsT06qYA9vUVeFHQrCdcn2MkHt+w
             Rr7W+4uaNb8Qxo/NUp9kodE9m/fg9XVd8wM7HUP4wJC0rE4GSnFvGg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2022-08-30T17:05:20Z"
-    mac: ENC[AES256_GCM,data:6f2RYsTBhMgLlwDgJ6vj2Jv82kFMNmjwYGV072YrfOE7qwjwcRRFE26L6mVkQ3yOt94wuOMAV/8gbqxY5hqVf1QxdnIiPDisks8yriquGBWM3RJZPA6i4Q8sBDqxA5Q9h/2geaHOpdu5If0XJolwhJOYso5buxWH2nrCIXQQ0B4=,iv:KaOccL/d/NSDI+jVMhbtBdNc/6ysK9nFUEbAHoyZ+lM=,tag:FnHUlPu5xmgJle4UVz0rcg==,type:str]
+    lastmodified: "2022-09-27T12:51:50Z"
+    mac: ENC[AES256_GCM,data:XC6YYy5ECsSmfIwoCDSCCTmRBbzhIAFszyrafqe4reBgOPktBjqukFT15l55nV0dYK263Zp6WA9H1Ruh33s73K8Nvi7yiPWi9EI+W8DHx5taQIzBgd+PeT622gdhuuXCjgwjOzwW8WZEQpaVaudDefvLK4i8cm/S2qu0UfLRbZY=,iv:GmwhIfJqq5iMq0tjG7i+alyMDslOvtJTDfxsa4SUAd4=,tag:enh1UrEE9Vbx4kDfL2WKnQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3