From 3e781cd069e72b90181c3d4babf6266018b0e2db Mon Sep 17 00:00:00 2001
From: willemml <willem@leit.so>
Date: Thu, 10 Aug 2023 20:54:19 -0700
Subject: [PATCH] emacs disable async mail sending

---
 .../willem/programs/emacs/default.nix         | 10 +++--
 .../profiles/willem/programs/emacs/init.el    | 40 +++++++++----------
 home-manager/profiles/willem/programs/zsh.nix |  6 +--
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/home-manager/profiles/willem/programs/emacs/default.nix b/home-manager/profiles/willem/programs/emacs/default.nix
index 873f592..d6d2da8 100644
--- a/home-manager/profiles/willem/programs/emacs/default.nix
+++ b/home-manager/profiles/willem/programs/emacs/default.nix
@@ -5,7 +5,7 @@
 }: let
   aspellPackage = pkgs.aspellWithDicts (d: [d.en d.en-science d.en-computers d.fr]);
   emacsPackage =
-    (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages
+    (pkgs.emacsPackagesFor pkgs.emacs29).emacsWithPackages
     (epkgs:
       (with epkgs; let
         company-mode = epkgs.trivialBuild {
@@ -48,6 +48,11 @@
                      (smtpmail-default-smtp-server "${host}")
                      (smtpmail-smtp-server "${host}")
                      (smtpmail-smtp-service ${port} )
+                     ${
+                  if account.flavor == "gmail.com"
+                  then "(mu4e-sent-messages-behavior 'delete)"
+                  else ""
+                }
                      (smtpmail-smtp-user "${account.userName}")
                      (user-mail-address "${account.address}"))
               ''
@@ -84,10 +89,7 @@
       in [
         all-the-icons
         all-the-icons-dired
-        arduino-mode
-        async
         auctex
-        calibredb
         cdlatex
         citeproc
         company-mode
diff --git a/home-manager/profiles/willem/programs/emacs/init.el b/home-manager/profiles/willem/programs/emacs/init.el
index d54f5bf..c1ea52b 100644
--- a/home-manager/profiles/willem/programs/emacs/init.el
+++ b/home-manager/profiles/willem/programs/emacs/init.el
@@ -7,6 +7,7 @@
 ;;
 ;;; Code:
 
+;; Make sure nix installed binaries are in the PATH
 (setenv "PATH" (concat "/Users/willem/.nix-profile/bin:" (getenv "PATH")))
 (add-to-list 'exec-path "/Users/willem/.nix-profile/bin")
 
@@ -38,6 +39,10 @@
 ;; Enable highlighting of current line.
 (global-hl-line-mode 1)
 
+;; Make it easier to enter tildes and backticks
+(global-set-key (kbd "M-n") "~")
+(global-set-key (kbd "M-N") "`")
+
 (defun with-buffer-name-prompt-and-make-subdirs ()
   "Offer to create parent directory when finding file in a non-existent directory."
   (let ((parent-directory (file-name-directory buffer-file-name)))
@@ -46,9 +51,6 @@
       (make-directory parent-directory t))))
 (add-to-list 'find-file-not-found-functions #'with-buffer-name-prompt-and-make-subdirs)
 
-(global-set-key (kbd "M-n") "~")
-(global-set-key (kbd "M-N") "`")
-
 ;; Don't warn when cannot guess python indent level
 (setq-default python-indent-guess-indent-offset-verbose nil)
 
@@ -58,9 +60,6 @@
 
 (require 'all-the-icons)
 (require 'all-the-icons-dired)
-(require 'arduino-mode)
-(require 'async)
-(require 'calibredb)
 (require 'cdlatex)
 (require 'citeproc)
 (require 'company)
@@ -112,20 +111,12 @@
 
 (add-hook 'dired-mode-hook 'all-the-icons-dired-mode)
 
-(setq arduino-executable "/Applications/Arduino.app/Contents/MacOS/Arduino")
-
-(setq send-mail-function 'async-smtpmail-send-it
-      message-send-mail-function 'async-smtpmail-send-it)
-
-(setq calibredb-root-dir (expand-file-name "~/Documents/calibre-library"))
-(setq calibredb-db-dir (expand-file-name "metadata.db" calibredb-root-dir))
-(setq calibredb-library-alist '(("~/Documents/calibre-library")))
-
 (setq company-format-margin-function 'company-text-icons-margin)
 (setq company-text-icons-add-background t)
 
 (add-hook 'after-init-hook 'global-company-mode)
 
+;; Configure Ivy/Swiper
 (global-set-key "\C-s" 'swiper)
 (global-set-key (kbd "C-c C-r") 'ivy-resume)
 (global-set-key (kbd "<f6>") 'ivy-resume)
@@ -271,13 +262,23 @@
 (meow-setup)
 (meow-global-mode 1)
 
-(define-key mu4e-main-mode-map (kbd "C-c C-u") 'my-mu4e-set-account)
+
+;; Configure mu4e
+
+;; Setup sending email with mu4e
+(setq send-mail-function 'smtpmail-send-it
+      message-send-mail-function 'smtpmail-send-it)
+
 (add-hook 'mu4e-compose-pre-hook 'my-mu4e-set-account)
 
 (defvar starttls-use-gnutls t)
 (setq message-kill-buffer-on-exit t
       mail-user-agent 'mu4e-user-agent)
 
+
+(define-key mu4e-main-mode-map (kbd "C-c C-u") 'my-mu4e-set-account)
+
+
 (set-variable 'read-mail-command 'mu4e)
 
 (mapc #'(lambda (var)
@@ -310,10 +311,7 @@
         (:name "Feed" :query "maildir:/feeds" :key ?f)
         (:name "XKCD" :query "list:xkcd.localhost" :key ?x)))
 
-(add-hook 'mu4e-compose-pre-hook 'my-mu4e-set-account)
-
-(setq browse-url-browser-function 'browse-url-generic)
-(setq browse-url-generic-program "firefox")
+;; Polymode config (add support for nix files with commented strings)
 
 (define-hostmode poly-nix-hostmode :mode 'nix-mode)
 
@@ -331,6 +329,8 @@
 
 (add-to-list 'auto-mode-alist '("\\.nix$" . poly-nix-mode))
 
+
+;; Automatically update hash for nix fetch functions
 (define-key nix-mode-map (kbd "C-c C-u") 'nix-update-fetch)
 
 (setq org-babel-octave-shell-command "octave -q")
diff --git a/home-manager/profiles/willem/programs/zsh.nix b/home-manager/profiles/willem/programs/zsh.nix
index f62f233..d3881f2 100644
--- a/home-manager/profiles/willem/programs/zsh.nix
+++ b/home-manager/profiles/willem/programs/zsh.nix
@@ -11,9 +11,9 @@
     dotDir = ".config/zsh";
     enableAutosuggestions = true;
     enableCompletion = true;
-    syntaxHighlighting = {
-      enable = true;
-    };
+    # syntaxHighlighting = {
+    #   enable = true;
+    # };
     enableVteIntegration = true;
 
     initExtraBeforeCompInit = ''