diff options
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/jao-custom-blog.el | 59 | ||||
| -rw-r--r-- | custom/jao-custom-gnus.el | 42 |
2 files changed, 57 insertions, 44 deletions
diff --git a/custom/jao-custom-blog.el b/custom/jao-custom-blog.el index 8d193bd..56f2378 100644 --- a/custom/jao-custom-blog.el +++ b/custom/jao-custom-blog.el @@ -3,32 +3,35 @@ ;;; Vars and setup (use-package htmlize :ensure t) -(defvar jao-blog-base-dir (expand-file-name "jao.io" jao-doc-dir)) +(defvar jao-blog-base-dir (expand-file-name "www" jao-doc-dir)) +(defvar jao-blog-publish-dir (expand-file-name "jao.io" jao-blog-base-dir)) (defun jao-blog-dir (p) (expand-file-name p jao-blog-base-dir)) +(defun jao-blog-publish-dir (p) (expand-file-name p jao-blog-publish-dir)) -(setq jao-org-blog-tag-files - (seq-difference (directory-files (jao-blog-dir "blog") nil "tag-.*") - "tag-norss.html") - - jao-org-blog-tags - (mapcar (lambda (f) - (string-match "tag-\\(.+\\)\\.html" f) - (format "<a href=\"/blog/%s\">%s</a>" - f (match-string 1 f))) - jao-org-blog-tag-files) - - jao-org-blog-tag-rss - (mapcar (lambda (f) - (string-match "\\(.+\\)-rss\\.xml" f) - (format "<a href=\"/blog/%s\">%s</a>" - f (match-string 1 f))) - (directory-files (jao-blog-dir "blog") nil ".*-rss.xml")) - - jao-org-blog-tag-names - (mapcar (lambda (f) - (string-match "tag-\\(.+\\)\\.html" f) - (match-string 1 f)) - jao-org-blog-tag-files)) + +(defvar jao-org-blog-tag-files + (seq-difference (directory-files (jao-blog-publish-dir "blog") nil "tag-.*") + "tag-norss.html")) + +(defvar jao-org-blog-tags + (mapcar (lambda (f) + (string-match "tag-\\(.+\\)\\.html" f) + (format "<a href=\"/blog/%s\">%s</a>" + f (match-string 1 f))) + jao-org-blog-tag-files)) + +(defvar jao-org-blog-tag-rss + (mapcar (lambda (f) + (string-match "\\(.+\\)-rss\\.xml" f) + (format "<a href=\"/blog/%s\">%s</a>" + f (match-string 1 f))) + (directory-files (jao-blog-publish-dir "blog") nil ".*-rss.xml"))) + +(defvar jao-org-blog-tag-names + (mapcar (lambda (f) + (string-match "tag-\\(.+\\)\\.html" f) + (match-string 1 f)) + jao-org-blog-tag-files)) ;;; Header (setq org-static-blog-page-header @@ -94,7 +97,7 @@ org-static-blog-publish-title "programming (and other) musings" org-static-blog-posts-directory (jao-blog-dir "posts/") org-static-blog-drafts-directory (jao-blog-dir "pages/") - org-static-blog-publish-directory (jao-blog-dir "blog/") + org-static-blog-publish-directory (jao-blog-publish-dir "blog/") org-static-blog-rss-extra "" ; "<author>mail@jao.io</author>\n" org-static-blog-rss-max-entries 30 org-static-blog-rss-excluded-tag "norss" @@ -117,11 +120,7 @@ ;;; New entries (defun jao-org-blog-publish-file (fname) - (interactive (list (read-file-name "Publish: " - nil - (buffer-file-name) - t - (buffer-file-name)))) + (interactive (list (read-file-name "Publish: " nil (buffer-file-name) t))) (let ((geiser-active-implementations '(guile)) (geiser-default-implementation 'guile) (whitespace-style nil)) diff --git a/custom/jao-custom-gnus.el b/custom/jao-custom-gnus.el index 4535fd3..2cd2499 100644 --- a/custom/jao-custom-gnus.el +++ b/custom/jao-custom-gnus.el @@ -201,7 +201,7 @@ (mapcar (lambda (b) `(imap :server "127.0.0.1" :port 1143 :user "jaor@pm.me" :password ,pwd - :stream starttls :predicate "DELETED UNSEEN" + :stream starttls :predicate "" :fetchflag "" :mailbox ,(if b (concat "Folders/" b) "INBOX"))) (or folders '(nil "drivel" "hacking" "bills" "prog" "words")))) @@ -658,18 +658,21 @@ (let ((feeds (thread-first (directory-files mail-source-directory nil "feeds\\.[^e]") (seq-difference '("feeds.trove"))))) - `(("nnml:bigml\\.inbox" "B" jao-themes-f00) - ("nnml:bigml\\.alba" "A" jao-themes-f00) - ("nnml:bigml\\.ryou" "R" jao-themes-f00) - ("nnml:bigml\\.bugs" "b" jao-themes-error) - ("nnml:bigml\\.support" "S" default) - ("nnml:bigml\\.[^aibsr]" "W" jao-themes-dimm) + `( + ;; ("nnml:bigml\\.inbox" "B" jao-themes-f00) + ;; ("nnml:bigml\\.alba" "A" jao-themes-f00) + ;; ("nnml:bigml\\.ryou" "R" jao-themes-f00) + ;; ("nnml:bigml\\.bugs" "b" jao-themes-error) + ;; ("nnml:bigml\\.support" "S" default) + ;; ("nnml:bigml\\.[^aibsr]" "W" jao-themes-dimm) + ("nnml:jao\\.bigml" "B" jao-themes-f00) ("nnml:jao\\.\\(inbox\\|trove\\)" "I" jao-themes-f01) - ("nnml:jao.hacking" "H" jao-themes-dimm) + ("nnml:jao.hunting" "H" jao-themes-f02) ("nnml:jao.write" "W" jao-themes-warning) ("nnml:jao.[^ithw]" "J" jao-themes-dimm) + ("nnml:jao.hacking" "J" jao-themes-dimm) (,(format "^nnml:%s" (regexp-opt feeds)) "F" jao-themes-dimm) - ("feeds\\.e" "E" jao-themes-dimm) + ;; ("feeds\\.e" "E" jao-themes-dimm) ("nnml:local" "l" jao-themes-dimm) ("nnrss:.*" "R" jao-themes-dimm) ("^\\(gwene\\|gmane\\)\\." "N" jao-themes-dimm)))) @@ -690,12 +693,19 @@ (defvar jao-gnus--notify-strs ()) +(defun jao-gnus--nnw-count () + (jao-when-darwin + (when-let* ((n (jao-nnw-unread-count))) + (when (> n 0) (list (format "(%s)" n)))))) + (defun jao-gnus--notify-strs () (let ((counts (jao-gnus--unread-counts))) - (seq-filter #'identity - (seq-map (lambda (args) - (apply 'jao-gnus--unread-label counts args)) - jao-gnus-tracked-groups)))) + (append + (seq-filter #'identity + (seq-map (lambda (args) + (apply 'jao-gnus--unread-label counts args)) + jao-gnus-tracked-groups)) + (jao-gnus--nnw-count)))) (defun jao-gnus--notify () (setq jao-gnus--notify-strs (jao-gnus--notify-strs)) @@ -794,7 +804,11 @@ '("message/rfc822" . jao-gnus-goto-file)))) ;;;; notmuch (use-package jao-notmuch-gnus - :demand t) + :demand t + :init + (jao-when-darwin + (setq jao-notmuch-gnus-mail-directory + (expand-file-name "gnus" jao-maildir)))) (jao-load-path "consult-notmuch") |