From 96a09e85012a2e82ad3b02c1bc64716c9a3c383c Mon Sep 17 00:00:00 2001
From: nathan mccarty <nathan@mccarty.io>
Date: Mon, 4 Jul 2022 01:17:05 -0400
Subject: [PATCH] Tweak mu4e

---
 doom.d/config.el                | 10 +++++++++-
 doom.d/config.org               | 12 +++++++++++-
 home-manager/programs/devel.nix |  2 +-
 home-manager/services/email.nix |  9 ++++++++-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/doom.d/config.el b/doom.d/config.el
index c79fe0d..b66f3c3 100644
--- a/doom.d/config.el
+++ b/doom.d/config.el
@@ -347,7 +347,15 @@ work if it thinks it needs to."
                         (mu4e-trash-folder . "/nathan@mccarty.io/Trash")
                         (mu4e-refile-folder . "/nathan@mccarty.io/Archive")
                         (smtpmail-smtp-user . "nathan@mccarty.io"))
-                      t))
+                      t)
+  (add-to-list 'mu4e-bookmarks
+               '(:name "Inbox - nathan@mccarty.io"
+                 :key ?m
+                 :query "maildir:\"/nathan@mccarty.io/Inbox\" AND NOT flag:trashed")))
 
 (after! mu4e
   (mu4e-alert-enable-mode-line-display))
+
+(setq +mu4e-backend nil)
+(after! mu4e
+        mu4e-get-mail-command "true")
diff --git a/doom.d/config.org b/doom.d/config.org
index a3b76ea..a7980f9 100644
--- a/doom.d/config.org
+++ b/doom.d/config.org
@@ -552,10 +552,20 @@ Tell it where our account's stuff is
                         (mu4e-trash-folder . "/nathan@mccarty.io/Trash")
                         (mu4e-refile-folder . "/nathan@mccarty.io/Archive")
                         (smtpmail-smtp-user . "nathan@mccarty.io"))
-                      t))
+                      t)
+  (add-to-list 'mu4e-bookmarks
+               '(:name "Inbox - nathan@mccarty.io"
+                 :key ?m
+                 :query "maildir:\"/nathan@mccarty.io/Inbox\" AND NOT flag:trashed")))
 #+end_src
 Tell it to enable the modeline display
 #+begin_src emacs-lisp
 (after! mu4e
   (mu4e-alert-enable-mode-line-display))
 #+end_src
+Tell it not to update the mail itself, we have a systemd unit for that
+#+begin_src emacs-lisp
+(setq +mu4e-backend nil)
+(after! mu4e
+        mu4e-get-mail-command "true")
+#+end_src
diff --git a/home-manager/programs/devel.nix b/home-manager/programs/devel.nix
index c07ca6c..a1271df 100644
--- a/home-manager/programs/devel.nix
+++ b/home-manager/programs/devel.nix
@@ -87,7 +87,7 @@ with lib; with nLib; {
     })
     # JavaScript/TypeScript Development
     (mkIf devel.js {
-      home.packages = with unstable; [
+      home.packages = with pkgs; [
         nodejs
         yarn
         nodePackages.typescript
diff --git a/home-manager/services/email.nix b/home-manager/services/email.nix
index 7ba2cc8..09bb627 100644
--- a/home-manager/services/email.nix
+++ b/home-manager/services/email.nix
@@ -77,7 +77,14 @@ with lib; {
     };
     services.mbsync = {
       enable = true;
-      postExec = "${pkgs.mu}/bin/mu index";
+      # Index manually with mu if we don't have emacs setup, but if we have the emacs service setup,
+      # run through emacsclient, as it will have the lock
+      postExec =
+        if config.nathan.programs.emacs.service
+        then
+          ''${config.nathan.programs.emacs.package}/bin/emacsclient --eval "(mu4e-update-mail-and-index t)"''
+        else
+          "${pkgs.mu}/bin/mu index";
     };
     # Setup mu for indexing emails
     programs.mu = {