a lot...just a lot

home/home.nix

@@ -40,9 +40,10 @@
 
   services.gpg-agent = {
     enable = true;
-    extraConfig = ''
-      pinentry-program ${pkgs.pinentry.qt}/bin/pinentry
-    '';
+    pinentryFlavor = "qt";
+    # extraConfig = ''
+    #   pinentry-program ${pkgs.pinentry.qt}/bin/pinentry
+    # '';
   };
 
   accounts.email = {
@@ -91,7 +92,7 @@
         mbsync.enable = true;
         mu.enable = true;
         flavor = "outlook.office365.com";
-        passwordCommand = "${pkgs.rbw}/bin/rbw get --full 'Office 365' | rg 'mumailemacs' | awk '{print $2}'";
+        passwordCommand = "cat ~/.config/access";
         realName = "Chris Cochrun";
         imap = {
           host = "outlook.office365.com";
@@ -108,7 +109,7 @@
           remove = "both";
           expunge = "both";
           extraConfig.account = {
-            AuthMechs = "LOGIN";
+            AuthMechs = "XOAUTH2";
           };
         };
         maildir.path = "office";
@@ -138,6 +139,7 @@
   programs.mu.enable = true;
 
   programs.mbsync = {
+    package = pkgs.isync.override { withCyrusSaslXoauth2 = true; };
     enable = true;
   };
   programs.msmtp.enable = true;