diff options
author | Yann Herklotz <git@yannherklotz.com> | 2021-09-11 15:39:21 +0100 |
---|---|---|
committer | Yann Herklotz <git@yannherklotz.com> | 2021-09-11 15:39:21 +0100 |
commit | 1178df21ab6c8400d7a03ee0cbebec1a224357a1 (patch) | |
tree | aba2e9d9f0317b59796ab0380d313b57dce4368f /doom | |
parent | c8c0e93ad9224f46fa959b9e113625611997cd1a (diff) | |
parent | 877f25d80c30e03197df8ae24f20207a01bcf0de (diff) | |
download | dotfiles-1178df21ab6c8400d7a03ee0cbebec1a224357a1.tar.gz dotfiles-1178df21ab6c8400d7a03ee0cbebec1a224357a1.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'doom')
-rw-r--r-- | doom/config.el | 60 |
1 files changed, 36 insertions, 24 deletions
diff --git a/doom/config.el b/doom/config.el index 7f49356..ddb4e4e 100644 --- a/doom/config.el +++ b/doom/config.el @@ -32,9 +32,6 @@ ;; numbers are disabled. For relative line numbers, set this to `relative'. (setq display-line-numbers-type nil) -(setq auth-sources '("~/.authinfo.gpg" - "~/.authinfo")) - ;; Add some keybinding customisations. ;; Stop emacs from freezing when trying to minimize it on a tiling WM. @@ -208,7 +205,10 @@ ;; Delete all whitespace until the first non-whitespace character. (use-package! hungry-delete - :config (global-hungry-delete-mode)) + :config + (global-hungry-delete-mode) + ;; disable hungry delete in minibuffer-mode: https://github.com/abo-abo/swiper/issues/2761 + (add-to-list 'hungry-delete-except-modes 'minibuffer-mode)) ;; Org configuration (use-package! org @@ -312,12 +312,11 @@ org-todo-keywords '((sequence "TODO(t)" ; A task that needs doing & is ready to do - "PROJECT(p)" ; A project, which usually contains other tasks - "START(s)" ; A task that is in progress + "PROJ(p)" ; A project, which usually contains other tasks + "STRT(s)" ; A task that is in progress "WAIT(w)" ; Something external is holding up this task "HOLD(h)" ; This task is paused/on hold because of me - "DEFERRED(h)" ; Demoted for later - "SOMEDAY(m)" ; todo some day + "SMDY(m)" ; todo some day "|" "DONE(d!)" ; Task successfully completed "KILL(k)") ; Task was cancelled, aborted or is no longer applicable @@ -768,26 +767,18 @@ (calendar-last-day-of-month month year))) (= day last-day-of-month))) -;;(setq smtpmail-smtp-server "smtp.mailbox.org" ;; <-- edit this !!! -;; smtpmail-smtp-service 587 ;; 25 is default -- uncomment and edit if needed -;; smtpmail-stream-type 'starttls) - -(require 'smtpmail) - -(setq user-mail-address "ymh15@ic.ac.uk" - smtpmail-smtp-server "smtp.office365.com" - smtpmail-smtp-service 587 - smtpmail-stream-type 'starttls - message-send-mail-function 'message-smtpmail-send-it) +(setq message-send-mail-function 'message-send-mail-with-sendmail) (setq message-signature "Yann Herklotz Imperial College London https://yannherklotz.com") -(setq message-send-mail-function 'message-smtpmail-send-it) - (setq auth-sources '("~/.authinfo" "~/.authinfo.gpg" "~/.netrc")) +(setq mail-specify-envelope-from t + message-sendmail-envelope-from 'header + mail-envelope-from 'header) + (use-package! modus-operandi-theme :config (custom-theme-set-faces! 'modus-operandi @@ -800,13 +791,34 @@ https://yannherklotz.com") (use-package! notmuch :config + (defun ymhg/notmuch-search-delete-mail (&optional beg end) + "Delete a message." + (interactive (notmuch-interactive-region)) + (if (member "deleted" (notmuch-search-get-tags)) + (notmuch-search-tag (list "-deleted")) + (notmuch-search-tag (list "+deleted" "-unread") beg end))) + + (defun ymhg/notmuch-show-delete-mail (&optional beg end) + "Delete a message." + (interactive (notmuch-interactive-region)) + (if (member "deleted" (notmuch-show-get-tags)) + (notmuch-show-tag (list "-deleted")) + (notmuch-show-tag (list "+deleted" "-unread") beg end))) + + (map! + :map notmuch-show-mode-map + "d" #'ymhg/notmuch-show-delete-mail) + (map! + :map notmuch-search-mode-map + "d" #'ymhg/notmuch-search-delete-mail) + (setq notmuch-saved-searches - '((:name "inbox" :query "tag:inbox not tag:trash" :key "n") + '((:name "inbox" :query "tag:inbox not tag:deleted" :key "n") (:name "flagged" :query "tag:flagged" :key "f") (:name "sent" :query "tag:sent" :key "s") (:name "drafts" :query "tag:draft" :key "d") - (:name "mailbox" :query "tag:mailbox not tag:trash" :key "m") - (:name "imperial" :query "tag:imperial not tag:trash" :key "i")))) + (:name "mailbox" :query "tag:mailbox not tag:deleted" :key "m") + (:name "imperial" :query "tag:imperial not tag:deleted" :key "i")))) ;;(use-package! ox-ssh ;; :after org |