2 files changed, 49 insertions, 17 deletions

@@ -15,7 +15,7 @@
                                    :key-type (symbol :tag "Variable")
                                    :value-type (sexp :tag "Value"))))
 
-(defcustom +notmuch-spam-tags '("+spam")
+(defcustom +notmuch-spam-tags '("+spam -inbox -unread")
   "List of tag changes to apply when marking a thread as spam."
   :group 'notmuch
   :type '(repeat string))
@@ -133,15 +133,17 @@ the saved search as well."
   (interactive)
   (if (require 'async nil t)
       (progn
-        (message "Polling mail async...")
+        (message "Polling mail (async)...")
         (async-start
          (lambda ()
-           (push "~/usr/share/emacs/site-lisp/" load-path)
-           (require 'notmuch-lib)
-           (notmuch-poll))
-         (lambda (result)
-           (message "%s" result))))
-    (user-error "Feature `async' not found!")))
+           (ignore-errors
+             (push "~/usr/share/emacs/site-lisp/" load-path)
+             (require 'notmuch-lib)
+             (notmuch-poll)))
+         (lambda (_)
+           (message "Polling mail (async)...done"))))
+    ;;(user-error "Feature `async' not found!")
+    (notmuch-poll)))
 
 
 ;;; Packages
@@ -180,7 +182,7 @@ the saved search as well."
           notmuch-search-oldest-first nil
           notmuch-archive-tags '("-inbox" "-unread")
           notmuch-draft-tags '("+draft" "-inbox" "-unread")
-          +notmuch-spam-tags '("+spam" "+Spam")
+          +notmuch-spam-tags '("+spam")
           mail-user-agent 'notmuch-user-agent
           message-mail-user-agent t
           notmuch-show-indent-content nil
@@ -253,5 +255,9 @@ This version doesn't add any initial-input."
   ;; Load init file
   (load notmuch-init-file :noerror))
 
+(use-package notmuch-tags
+  :load-path "~/src/emacs/notmuch-tags.el/"
+  :commands (notmuch-tags-mode))
+
 (provide 'acdw-mail)
 ;;; acdw-mail.el ends here
@@ -241,6 +241,7 @@ If LIST is non-nil, return the result as a list instead of a string."
   (org-property-value ((t :inherit fixed-pitch)))
   (org-special-keyword ((t :inherit fixed-pitch)))
   (org-indent ((t :inherit fixed-pitch)))
+  (org-table ((t :inherit fixed-pitch)))
   :config
   ;; Options
   (setopt org-adapt-indentation nil
@@ -305,14 +306,15 @@ If LIST is non-nil, return the result as a list instead of a string."
   (keymap-set org-mode-map "RET" #'+org-return-dwim)
   (keymap-set org-mode-map "S-<return>" #'+org-table-copy-down|+org-return-dwim)
   ;; Hooks
-  (add-hook 'org-mode-hook #'variable-pitch-mode)
-  (autoload 'visual-fill-column-mode "visual-fill-column" nil t)
-  (add-hook 'org-mode-hook #'visual-fill-column-mode)
-  (add-hook 'org-mode-hook #'turn-off-auto-fill)
-  (add-hook 'org-mode-hook #'org-indent-mode)
-  (add-hook 'org-mode-hook #'abbrev-mode)
   (add-hook 'org-mode-hook
-            (defun before-save@org-mode ()
+            (defun org-mode@setup ()
+              (when (require 'visual-fill-column nil t)
+                (setq-local visual-fill-column-extra-text-width '(8 . 8))
+                (visual-fill-column-mode))
+              (variable-pitch-mode)
+              (turn-off-auto-fill)
+              (org-indent-mode)
+              (abbrev-mode)
               (add-hook 'before-save-hook
                         (defun before-save@org-mode@before-save ()
                           (org-align-tags 'all)
@@ -331,6 +333,21 @@ If LIST is non-nil, return the result as a list instead of a string."
         "\\(?:[         ]+\\|$\\)\\)?")
       0 'org-indent))))
 
+(use-package org-clock
+  :bind (("M-<f9>" . org-clock-out)
+         :map org-mode-map
+         ("<f8>" . org-clock-in)
+         ("<f9>" . org-clock-out))
+  :config
+  (setopt org-clock-clocked-in-display 'mode-line
+          global-mode-string
+          '((t jabber-activity-mode-string)
+            (:eval (when (org-clocking-p) org-mode-line-string))
+            (display-time-mode display-time-string)))
+  (add-hook 'org-clock-in-hook (defun org-clock@remove-from-global-mode-string ()
+                                 (setq global-mode-string
+                                       (delq 'org-mode-line-string global-mode-string)))))
+
 (use-package org-agenda
   :bind (("C-c a" . org-agenda))
   :config
@@ -359,6 +376,7 @@ If LIST is non-nil, return the result as a list instead of a string."
   (add-hook 'org-agenda-mode-hook #'truncate-lines-local-mode)
   (add-hook 'org-agenda-mode-hook #'hl-line-mode)
   (add-hook 'org-agenda-after-show-hook #'org-narrow-to-subtree)
+  (add-hook 'org-agenda-after-show-hook #'+org-hide-drawers-except-point)
   (define-advice org-agenda-files (:filter-return (files) skip-regexp)
     "Filter some files from `org-agenda'."
     (when org-agenda-skip-file-regexp
@@ -424,11 +442,19 @@ effect for exporting link types)."
                         :height 1.0)))
   :config
   (setopt org-modern-star nil
+          org-modern-list '((43 . "◦")
+                            (45 . "•")
+                            (42 . "‣"))
           org-hide-leading-stars nil
           org-modern-hide-stars nil
           org-tags-column 0
-          org-modern-keyword nil)
+          org-modern-keyword nil
+          org-modern-table nil)
   (global-org-modern-mode))
 
+(use-package org-taskwise
+  :after org
+  :load-path "~/src/emacs/org-taskwise/")
+
 (provide 'acdw-org)
 ;;; acdw-org.el ends here