1 files changed, 31 insertions, 14 deletions

@@ -464,7 +464,7 @@
 
 (setup notmuch
   (:load-from "~/usr/share/emacs/site-lisp/")
-  ;;(:load-after org-contacts)
+  (:load-after org-contacts)
   (:also-load +notmuch +message)
   (+define-dir notmuch/ (sync/ "emacs/notmuch")
     "Notmuch configuration and data.")
@@ -567,11 +567,11 @@
            org-startup-truncated nil
            org-startup-with-inline-images t
            org-tags-column (- (- fill-column (length org-ellipsis)))
-           org-todo-keywords '((sequence "TODO(t)" "WAIT(w@/!)"
+           org-todo-keywords '((sequence "TODO(t)" "WAIT(w@/!)" "ONGOING(o@)"
                                          "|" "DONE(d!)")
-                               (sequence "ONGOING(o@)")
                                (sequence "|" "CANCELED(k@)")
-                               (sequence "MEETING(m)"))
+                               (sequence "MEETING(m)")
+                               (sequence "ASSIGNED(a@/!)" "REVIEW(r)" "|" "DONE(d!)"))
            org-emphasis-alist '(("*" org-bold)
                                 ("/" org-italic)
                                 ("_" org-underline)
@@ -698,7 +698,7 @@
   (+org-capture-sort))
 
 (setup org-contacts (:quit)
-  (:load-after org)
+  (:require)
   (:also-straight org-vcard)                 ; for importing Vcard files
   (:option org-contacts-matcher "contact")    ; Contacts are tagged "contact"
   )
@@ -854,6 +854,12 @@ They are completed by \"M-x TAB\" only in Tramp debug buffers."
   (:when-loaded
     (setf (alist-get ?. avy-dispatch-alist) #'avy-action-embark)))
 
+(setup (:straight bbdb)
+  (:require bbdb-autoloads
+            bbdb)
+  (:also-straight bbdb-vcard)
+  (bbdb-initialize 'gnus 'message))
+
 (setup (:straight (bongo :type git
                          :flavor melpa
                          :files ("*.el" "*.texi" "images" "*.rb" "bongo-pkg.el" "*.info")
@@ -1344,7 +1350,9 @@ See also `crux-reopen-as-root-mode'."
   (:+leader "f" #'elfeed "C-f" #'elfeed)
   (advice-add #'elfeed-search-fetch :after #'beginning-of-buffer)
   (:with-mode elfeed-search-mode
-    (:bind "&" #'+elfeed-search-browse-generic)
+    (:bind "&" #'+elfeed-search-browse-generic
+           "w" #'elfeed-search-yank
+           "y" nil)
     (:hook #'hl-line-mode)
     ;; https://old.reddit.com/r/emacs/comments/rlli0u/whats_your_favorite_defadvice/hphfh4e/
     (advice-add #'elfeed-search-update--force :after #'elfeed-db-save)
@@ -1353,7 +1361,9 @@ See also `crux-reopen-as-root-mode'."
     (:bind "SPC" #'+elfeed-scroll-up-command
            "S-SPC"  #'+elfeed-scroll-down-command
            "&" #'+elfeed-show-browse-generic
-           "RET" #'shr-browse-url)
+           "RET" #'shr-browse-url
+           "w" #'elfeed-show-yank
+           "y" nil)
     (:hook #'reading-mode)
     (:option +elfeed--update-repeat (* 60 30) ; 1/2 hour
              +elfeed--update-first-time 60))
@@ -1744,9 +1754,10 @@ See also `crux-reopen-as-root-mode'."
   (:option +mwim-passthrough-modes '(comint-mode
                                      eshell-mode
                                      vterm-mode
-                                     crossword-mode))
-  (:global "C-a" #'+mwim-beginning-maybe
-           "C-e" #'+mwim-end-maybe))
+                                     crossword-mode
+                                     geiser-repl-mode))
+  (:global "C-a" #'mwim-beginning
+           "C-e" #'mwim-end))
 
 (setup (:straight notmuch-bookmarks)
   (:load-after notmuch)
@@ -1780,6 +1791,7 @@ See also `crux-reopen-as-root-mode'."
   (:hook-into org-mode))
 
 (setup (:straight org-download)
+  (:require)
   (:option org-download-method 'attach
            org-download-backend (cond ((executable-find "curl") 'curl)
                                       ((executable-find "wget") 'wget)
@@ -1787,6 +1799,9 @@ See also `crux-reopen-as-root-mode'."
   (add-hook 'dired-mode-hook 'org-download-enable))
 
 (setup (:straight org-mime)
+  (:option org-mime-export-ascii 'utf-8))
+
+(setup (:straight org-mime)
   (add-hook 'message-mode-hook
             (defun org-mime-setup@message-mode ()
               (local-set-key (kbd "C-c M-o") 'org-mime-htmlize)))
@@ -1801,9 +1816,9 @@ See also `crux-reopen-as-root-mode'."
 (setup (:straight (org-taskwise
                    :host github
                    :repo "duckwork/org-taskwise.el"))
-  (:load-after org)
-  (:bind-into org-mode
-    "C-x n t" #'org-taskwise-narrow-to-task))
+  (with-eval-after-load 'org
+    (require 'org-taskwise)
+    (define-key org-mode-map (kbd "C-x n t") #'org-taskwise-narrow-to-task)))
 
 (setup (:straight org-visibility)
   (:require org-visibility)
@@ -1834,7 +1849,8 @@ See also `crux-reopen-as-root-mode'."
                   lisp-interaction-mode-hook
                   lisp-mode-hook
                   scheme-mode-hook
-                  geiser-mode-hook))
+                  geiser-mode-hook
+                  geiser-repl-mode-hook))
     (add-hook hook #'enable-paredit-mode))
   (:also-load eldoc)
   (eldoc-add-command #'paredit-backward-delete #'paredit-close-round))
@@ -1916,6 +1932,7 @@ See also `crux-reopen-as-root-mode'."
               +modeline-text-scale
               ,(+modeline-concat
                 '(+modeline-god-mode
+                  +modeline-kmacro-indicator
                   +modeline-reading-mode
                   +modeline-narrowed)
                 ",")