about summary refs log tree commit diff stats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/acdw-mail.el24
-rw-r--r--lisp/acdw-org.el42
2 files changed, 49 insertions, 17 deletions
diff --git a/lisp/acdw-mail.el b/lisp/acdw-mail.el index ae78fa0..2a7d128 100644 --- a/lisp/acdw-mail.el +++ b/lisp/acdw-mail.el
@@ -15,7 +15,7 @@
15 :key-type (symbol :tag "Variable") 15 :key-type (symbol :tag "Variable")
16 :value-type (sexp :tag "Value")))) 16 :value-type (sexp :tag "Value"))))
17 17
18(defcustom +notmuch-spam-tags '("+spam") 18(defcustom +notmuch-spam-tags '("+spam -inbox -unread")
19 "List of tag changes to apply when marking a thread as spam." 19 "List of tag changes to apply when marking a thread as spam."
20 :group 'notmuch 20 :group 'notmuch
21 :type '(repeat string)) 21 :type '(repeat string))
@@ -133,15 +133,17 @@ the saved search as well."
133 (interactive) 133 (interactive)
134 (if (require 'async nil t) 134 (if (require 'async nil t)
135 (progn 135 (progn
136 (message "Polling mail async...") 136 (message "Polling mail (async)...")
137 (async-start 137 (async-start
138 (lambda () 138 (lambda ()
139 (push "~/usr/share/emacs/site-lisp/" load-path) 139 (ignore-errors
140 (require 'notmuch-lib) 140 (push "~/usr/share/emacs/site-lisp/" load-path)
141 (notmuch-poll)) 141 (require 'notmuch-lib)
142 (lambda (result) 142 (notmuch-poll)))
143 (message "%s" result)))) 143 (lambda (_)
144 (user-error "Feature `async' not found!"))) 144 (message "Polling mail (async)...done"))))
145 ;;(user-error "Feature `async' not found!")
146 (notmuch-poll)))
145 147
146 148
147;;; Packages 149;;; Packages
@@ -180,7 +182,7 @@ the saved search as well."
180 notmuch-search-oldest-first nil 182 notmuch-search-oldest-first nil
181 notmuch-archive-tags '("-inbox" "-unread") 183 notmuch-archive-tags '("-inbox" "-unread")
182 notmuch-draft-tags '("+draft" "-inbox" "-unread") 184 notmuch-draft-tags '("+draft" "-inbox" "-unread")
183 +notmuch-spam-tags '("+spam" "+Spam") 185 +notmuch-spam-tags '("+spam")
184 mail-user-agent 'notmuch-user-agent 186 mail-user-agent 'notmuch-user-agent
185 message-mail-user-agent t 187 message-mail-user-agent t
186 notmuch-show-indent-content nil 188 notmuch-show-indent-content nil
@@ -253,5 +255,9 @@ This version doesn't add any initial-input."
253 ;; Load init file 255 ;; Load init file
254 (load notmuch-init-file :noerror)) 256 (load notmuch-init-file :noerror))
255 257
258(use-package notmuch-tags
259 :load-path "~/src/emacs/notmuch-tags.el/"
260 :commands (notmuch-tags-mode))
261
256(provide 'acdw-mail) 262(provide 'acdw-mail)
257;;; acdw-mail.el ends here 263;;; acdw-mail.el ends here
diff --git a/lisp/acdw-org.el b/lisp/acdw-org.el index 5255a50..566deed 100644 --- a/lisp/acdw-org.el +++ b/lisp/acdw-org.el
@@ -241,6 +241,7 @@ If LIST is non-nil, return the result as a list instead of a string."
241 (org-property-value ((t :inherit fixed-pitch))) 241 (org-property-value ((t :inherit fixed-pitch)))
242 (org-special-keyword ((t :inherit fixed-pitch))) 242 (org-special-keyword ((t :inherit fixed-pitch)))
243 (org-indent ((t :inherit fixed-pitch))) 243 (org-indent ((t :inherit fixed-pitch)))
244 (org-table ((t :inherit fixed-pitch)))
244 :config 245 :config
245 ;; Options 246 ;; Options
246 (setopt org-adapt-indentation nil 247 (setopt org-adapt-indentation nil
@@ -305,14 +306,15 @@ If LIST is non-nil, return the result as a list instead of a string."
305 (keymap-set org-mode-map "RET" #'+org-return-dwim) 306 (keymap-set org-mode-map "RET" #'+org-return-dwim)
306 (keymap-set org-mode-map "S-<return>" #'+org-table-copy-down|+org-return-dwim) 307 (keymap-set org-mode-map "S-<return>" #'+org-table-copy-down|+org-return-dwim)
307 ;; Hooks 308 ;; Hooks
308 (add-hook 'org-mode-hook #'variable-pitch-mode)
309 (autoload 'visual-fill-column-mode "visual-fill-column" nil t)
310 (add-hook 'org-mode-hook #'visual-fill-column-mode)
311 (add-hook 'org-mode-hook #'turn-off-auto-fill)
312 (add-hook 'org-mode-hook #'org-indent-mode)
313 (add-hook 'org-mode-hook #'abbrev-mode)
314 (add-hook 'org-mode-hook 309 (add-hook 'org-mode-hook
315 (defun before-save@org-mode () 310 (defun org-mode@setup ()
311 (when (require 'visual-fill-column nil t)
312 (setq-local visual-fill-column-extra-text-width '(8 . 8))
313 (visual-fill-column-mode))
314 (variable-pitch-mode)
315 (turn-off-auto-fill)
316 (org-indent-mode)
317 (abbrev-mode)
316 (add-hook 'before-save-hook 318 (add-hook 'before-save-hook
317 (defun before-save@org-mode@before-save () 319 (defun before-save@org-mode@before-save ()
318 (org-align-tags 'all) 320 (org-align-tags 'all)
@@ -331,6 +333,21 @@ If LIST is non-nil, return the result as a list instead of a string."
331 "\\(?:[ ]+\\|$\\)\\)?") 333 "\\(?:[ ]+\\|$\\)\\)?")
332 0 'org-indent)))) 334 0 'org-indent))))
333 335
336(use-package org-clock
337 :bind (("M-<f9>" . org-clock-out)
338 :map org-mode-map
339 ("<f8>" . org-clock-in)
340 ("<f9>" . org-clock-out))
341 :config
342 (setopt org-clock-clocked-in-display 'mode-line
343 global-mode-string
344 '((t jabber-activity-mode-string)
345 (:eval (when (org-clocking-p) org-mode-line-string))
346 (display-time-mode display-time-string)))
347 (add-hook 'org-clock-in-hook (defun org-clock@remove-from-global-mode-string ()
348 (setq global-mode-string
349 (delq 'org-mode-line-string global-mode-string)))))
350
334(use-package org-agenda 351(use-package org-agenda
335 :bind (("C-c a" . org-agenda)) 352 :bind (("C-c a" . org-agenda))
336 :config 353 :config
@@ -359,6 +376,7 @@ If LIST is non-nil, return the result as a list instead of a string."
359 (add-hook 'org-agenda-mode-hook #'truncate-lines-local-mode) 376 (add-hook 'org-agenda-mode-hook #'truncate-lines-local-mode)
360 (add-hook 'org-agenda-mode-hook #'hl-line-mode) 377 (add-hook 'org-agenda-mode-hook #'hl-line-mode)
361 (add-hook 'org-agenda-after-show-hook #'org-narrow-to-subtree) 378 (add-hook 'org-agenda-after-show-hook #'org-narrow-to-subtree)
379 (add-hook 'org-agenda-after-show-hook #'+org-hide-drawers-except-point)
362 (define-advice org-agenda-files (:filter-return (files) skip-regexp) 380 (define-advice org-agenda-files (:filter-return (files) skip-regexp)
363 "Filter some files from `org-agenda'." 381 "Filter some files from `org-agenda'."
364 (when org-agenda-skip-file-regexp 382 (when org-agenda-skip-file-regexp
@@ -424,11 +442,19 @@ effect for exporting link types)."
424 :height 1.0))) 442 :height 1.0)))
425 :config 443 :config
426 (setopt org-modern-star nil 444 (setopt org-modern-star nil
445 org-modern-list '((43 . "◦")
446 (45 . "•")
447 (42 . "‣"))
427 org-hide-leading-stars nil 448 org-hide-leading-stars nil
428 org-modern-hide-stars nil 449 org-modern-hide-stars nil
429 org-tags-column 0 450 org-tags-column 0
430 org-modern-keyword nil) 451 org-modern-keyword nil
452 org-modern-table nil)
431 (global-org-modern-mode)) 453 (global-org-modern-mode))
432 454
455(use-package org-taskwise
456 :after org
457 :load-path "~/src/emacs/org-taskwise/")
458
433(provide 'acdw-org) 459(provide 'acdw-org)
434;;; acdw-org.el ends here 460;;; acdw-org.el ends here