Merge branch 'master' of github.com:yulqen/emacs

2 files changed, 36 insertions, 0 deletions

diff --git a/custom.el b/custom.el
index a8d438e..835f6bd 100644
--- a/custom.el
+++ b/custom.el
@@ -9,8 +9,17 @@
  '(display-line-numbers-type 'relative t)
  '(display-time-mode t)
  '(ispell-dictionary nil)
+ '(notmuch-saved-searches
+   '((:name "Inbox" :query "tag:inbox" :count-query "tag:inbox and tag:unread" :sort-order newest-first :key "i")
+     (:name "Unread" :query "tag:unread" :sort-order newest-first :key "u")
+     (:name "Sent" :query "tag:sent" :sort-order newest-first :key "s")
+     (:name "All Mail" :query "*" :sort-order newest-first :key "a")
+     (:name "School" :query "tag:school" :sort-order newest-first :key "S")
+     (:name "Deleted" :query "tag:deleted" :sort-order newest-first :key "d")
+     (:name "new" :query "tag:new")))
  '(package-selected-packages
    '(ef-themes flycheck-clj-kondo pass vertico denote orderless consult-lsp undo-tree embark-consult embark marginalia markdown-mode eglot helm popup async notmuch ivy calfw-org calfw unicode-fonts deft cider org-roam org yasnippet-snippets which-key vterm use-package rainbow-delimiters pdf-tools paredit magit ledger-mode gruvbox-theme flycheck expand-region evil elpy elfeed-score diminish counsel cmake-mode browse-kill-ring beacon auto-package-update amx ace-window ace-jump-mode))
+
  '(safe-local-variable-values
    '((denote-known-keywords "defnucsyr" "metanote" "meeting" "cyber" "baes" "rrdl" "opberths" "swow")
      (org-hide-leading-stars \.t)
diff --git a/init.el b/init.el
index f9cdc05..d785d7d 100644
--- a/init.el
+++ b/init.el
@@ -297,6 +297,23 @@ Restart works only on graphic display."
   ;; - `ef-themes-preview-colors-current'
   )
 
+(use-package consult-notes
+  :ensure t
+  :bind (("C-c d" . consult-notes))
+  :commands (consult-notes
+             consult-notes-search-in-all-notes
+             ;; if using org-roam 
+             consult-notes-org-roam-find-node
+             consult-notes-org-roam-find-node-relation)
+  :config
+  (setq consult-notes-sources
+        '(("Denote"  ?d  "~/Documents/denote/")
+          ("Mod-Denote"  ?m  "~/Documents/mod-denote/")
+          ("Notes archive"  ?n  "~/Notes/Archive"))) ;; Set notes dir(s), see below
+  ;; Set org-roam integration OR denote integration
+    (when (locate-library "denote")
+  (consult-notes-denote-mode)))
+
 (use-package pass
   :ensure t)
 
@@ -619,7 +636,13 @@ Restart works only on graphic display."
           (notmuch-search-tag (list "-deleted"))
         (notmuch-search-tag (list "+deleted")))))
   (setq send-mail-function 'sendmail-send-it
+        notmuch-search-result-format '(("date" . "%12s ")
+                                       ("count" . "%7s ")
+                                       ("authors" . "%-20s ")
+                                       ("subject" . "%-80s ")
+                                       ("tags" . "(%s) "))
         sendmail-program "/usr/bin/msmtp"
+        notmuch-archive-tags '("-inbox" "+archived" "-new")
         message-kill-buffer-on-exit t
         notmuch-draft-folder "fastmail/Drafts"
         notmuch-fcc-dirs "fastmail/Sent +sent -unread -inbox"
@@ -646,6 +669,10 @@ Restart works only on graphic display."
                                         :query "*"
                                         :sort-order newest-first
                                         :key "a")
+                                 (:name "School"
+                                        :query "tag:school"
+                                        :sort-order newest-first
+                                        :key "S")                                 
                                  (:name "Deleted"
                                         :query "tag:deleted"
                                         :sort-order newest-first