commit e1cc727f43b11bffdad0bfbfc3a659329e5693d2
parent ac19172de5f5b4cda63ad6c159457ea317d4bfaf
Author: Mark Feller <mark@mfeller.io>
Date: Wed, 28 Apr 2021 11:21:48 -0600
update emacs config and add acme dark theme initial cut
Diffstat:
3 files changed, 359 insertions(+), 9 deletions(-)
diff --git a/dots/.config/emacs/lisp/acme-dark/acme-dark-theme.el b/dots/.config/emacs/lisp/acme-dark/acme-dark-theme.el
@@ -0,0 +1,332 @@
+;;; acme-dark-theme.el --- A theme for prose.
+
+;; Copyright 2018-now Kunal Bhalla
+
+;; Author: Kunal Bhalla <bhalla.kunal@gmail.com>
+;; URL: https://github.com/kunalb/acme-dark/
+;; Version: 2.0
+
+;;; Commentary:
+
+;; Emacs has very good support for multiple fonts in a single
+;; file. Acme-Dark uses this support to make it much more convenient to
+;; write prose within Emacs, with particular attention paid to
+;; org-mode and markdown-mode. Code blocks, tables, etc are
+;; formatted in monospace text with the appropriate backgrounds.
+
+;; Recommended customizations for using this theme
+;;
+;; - Set up the base fonts you'd like to use in Emacs before loading Acme-Dark
+;; (set-face-attribute 'default nil :family "Iosevka" :height 130)
+;; (set-face-attribute 'fixed-pitch nil :family "Iosevka")
+;; (set-face-attribute 'variable-pitch nil :family "Baskerville")
+;; On loading this theme captures the default and treats that for fixed-pitch
+;; rendering.
+;;
+;; - Enable variable pitch mode for editing text
+;; (add-hook 'text-mode-hook
+;; (lambda ()
+;; (variable-pitch-mode 1))
+;;
+;; - Some other modes I like to enable/disable
+;; (olivetti-mode 1) ;; Centers text in the buffer
+;; (flyspell-mode 1) ;; Catch Spelling mistakes
+;; (typo-mode 1) ;; Good for symbols like em-dash
+;; (blink-cursor-mode 0) ;; Reduce visual noise
+;; (linum-mode 0) ;; No line numbers for prose
+;;
+;; - And prettier org mode bullets:
+;; (setq org-bullets-bullet-list
+;; '("◉" "○"))
+;; (org-bullets 1)
+
+;;; Code:
+
+(defvar acme-dark--monospace-height
+ (face-attribute 'fixed-pitch :height nil 'default)
+ "The original height stored as a defvar to stay constant across reloads.")
+
+(defvar mode-line-spacing 5)
+
+(defun acme-dark--height (multiplier)
+ "Scale up the height according to the MULTIPLIER."
+ (truncate (* acme-dark--monospace-height multiplier)))
+
+(deftheme acme-dark
+ "A prose friendly theme.")
+
+(make-face 'mode-line-height)
+
+(let (
+ ;; Primary Colors
+ (fg "#d5d5d5")
+ (fg-light "#f5f5f5")
+ (fg-dark "#c5c5c5")
+ (bg "#1a1a17")
+ (bg-light "#1f1f1a")
+ (bg-dark "#0a0a07")
+
+ ; light colors
+ (black-light "#333333")
+ (white-light "#ffffff")
+ (yellow-light "#fff59d")
+ (red-light "#ff1744")
+
+ ; normal colors
+ (black "#111111")
+ (white "#dddddd")
+ (yellow "#fff176")
+ (blue "#02a4fb")
+ (green "#388d3c")
+ (cyan "#80a6b9")
+ (red "#e9420f")
+ (purple "#673ab7")
+ (brown "#b78f81")
+
+ ;; dark colors
+ (black-dark "#000000")
+ (white-dark "#999999")
+ (cyan-dark "#455a64")
+ (blue-dark "#3f51b5")
+ (red-dark "#e3605a")
+ (purple-dark "#4f4f77")
+ (brown-dark "#785047"))
+
+ (let ((emph white)
+ (sep "gray8")
+ (hlt "gray7")
+ (bg-hlt "#333333")
+ (meta brown-dark)
+ (link "#303F9F")
+ (link-underline "#304FFE")
+ (vlink-underline "#1A237E")
+ (button "gray73")
+ (cursor "gray71")
+ (paren-match-bg red-light)
+ (paren-match-fg bg)
+ (search-fg red-light)
+ (search-bg "#333333")
+ (search-fail-bg bg)
+ (tooltip-fg "#333333")
+ (tooltip-bg "#666666")
+ (shadow "#646464")
+ (secondary-bg "#333333")
+ (trailing-bg "#ff8a65")
+ (mode-line-fg white)
+ (mode-line-hlt white)
+ (mode-line-inactive white-dark)
+ (header red-dark)
+ (header-line-bg white)
+ (string green)
+ (function-name fg)
+ (keyword fg)
+ (constant blue)
+ (type fg)
+ (variable fg-dark)
+ (modeline bg-light)
+ (modeline-border bg-dark)
+
+ ;; org
+ (org-meta brown)
+ (org-document-info brown)
+ (org-table white)
+ (org-quote-fg purple-dark)
+ (org-quote-bg white)
+ (org-date fg)
+ (org-title red)
+ (org-title-underline "#aaaaaa")
+ (org-checkbox "#aaaaaa")
+ (org-scheduled "#333333")
+ (org-scheduled-today "#111111")
+ (org-done green)
+ (org-todo red)
+ (org-tag "#777777")
+ (org-block-line "#d0d0d0")
+ (org-block-bg white)
+ (org-agenda-structure-fg "#555555")
+ (org-agenda-structure-bg white)
+ (org-agenda-today-fg "#000000")
+ (org-agenda-today-bg fg)
+ (org-special-keyword "#777777")
+ (org-sched-prev "#222222")
+ (org-agenda-done "#777777")
+
+ (hl-line "#efefef")
+ (linum-hlt "#808080")
+ (linum "#555555")
+ (markdown-markup brown)
+ (markdown-metadata "#777777")
+ (markdown-language purple)
+ (markdown-list "#000000")
+ (markdown-code-bg white)
+ (markdown-pre-bg white)
+ (markdown-header-delimiter brown)
+ (imenu brown-dark))
+
+(set-face-attribute
+ (custom-theme-set-faces
+ 'acme-dark
+ `(variable-pitch ((t (:family ,(face-attribute 'variable-pitch :family) :height ,(acme-dark--height 1.25)))))
+ `(default ((t (:background ,bg :foreground ,fg))))
+ `(italic ((t (:foreground ,emph :slant italic))))
+ `(highlight ((t (:background ,hlt :overline nil))))
+ `(region ((t (:background ,bg-hlt))))
+ `(fringe ((t (:background ,bg))))
+ `(button ((t (:inherit default :foreground ,button))))
+ `(escape-glyph ((t (:foreground ,purple))))
+ `(link ((t (:underline (:color ,link-underline :style line) :foreground ,link))))
+ `(link-visited ((t (:inherit link :foreground ,link :underline (:color ,vlink-underline :style line)))))
+ `(cursor ((t (:background ,cursor))))
+ `(show-paren-match ((t (:background ,paren-match-fg :foreground ,paren-match-bg))))
+ `(isearch ((t (:foreground ,search-fg :background ,search-bg))))
+ `(isearch-fail ((t (:background ,search-fail-bg))))
+ `(query-replace ((t (:inherit isearch))))
+ `(tooltip ((t (:inherit default :foreground ,tooltip-fg :background ,tooltip-bg))))
+ `(shadow ((t (:foreground ,shadow))))
+ `(secondary-selection ((t (:background ,secondary-bg))))
+ `(trailing-whitespace ((t (:background ,trailing-bg))))
+ `(lazy-highlight ((t (:foreground ,black :background ,white-light))))
+ `(next-error ((t (:inherit region))))
+ `(window-divider ((t (:background ,sep :foreground ,sep))))
+ `(vertical-border ((t (:background ,sep :foreground ,sep))))
+ `(minibuffer-prompt ((t (:inherit fixed-pitch :weight bold :foreground ,meta))))
+
+ ;; mode line
+ `(header-line ((t (:overline nil :background ,header-line-bg :box (:line-width 1 :color "#8888cc") :underline ,sep :inherit mode-line))))
+ `(mode-line ((t (:inherit fixed-pitch :foreground ,mode-line-fg :background ,modeline :overline ,modeline-border :box (:line-width 1 :color ,modeline-border)))))
+ `(mode-line-inactive ((t (:inherit fixed-pitch :foreground ,mode-line-inactive :background ,modeline :overline ,modeline-border :box (:line-width 1 :color ,modeline-border)))))
+ `(mode-line-height ((t (:foreground ,modeline-border :background ,modeline-border :box (:line-width ,mode-line-spacing :color ,modeline-border)))))
+ `(mode-line-buffer-id ((t (:weight bold))))
+ `(mode-line-emphasis ((t (:weight bold))))
+ `(mode-line-highlight ((t (:background ,mode-line-hlt))))
+
+ `(error ((t (:inherit fixed-pitch))))
+
+ ;; primary font lock
+ `(font-lock-builtin-face ((t (:inherit fixed-pitch :foreground ,red))))
+ `(font-lock-comment-delimiter-face ((t (:inherit fixed-pitch :inherit font-lock-comment-face))))
+ `(font-lock-comment-face ((t (:inherit fixed-pitch :foreground ,shadow))))
+ `(font-lock-constant-face ((t (:inherit fixed-pitch))))
+ `(font-lock-doc-face ((t (:inherit fixed-pitch :inherit font-lock-string-face))))
+ `(font-lock-function-name-face ((t (:inherit fixed-pitch :foreground ,function-name))))
+ `(font-lock-keyword-face ((t (:inherit fixed-pitch :foreground ,keyword :weight bold ))))
+ `(font-lock-preprocessor-face ((t (:inherit fixed-pitch :inherit font-lock-builtin-face))))
+ `(font-lock-regexp-grouping-backslash ((t (:inherit fixed-pitch :inherit bold))))
+ `(font-lock-regexp-grouping-construct ((t (:inherit fixed-pitch :inherit bold))))
+ `(font-lock-string-face ((t (:inherit fixed-pitch :foreground ,string))))
+ `(font-lock-type-face ((t (:inherit fixed-pitch))))
+ `(font-lock-variable-name-face ((t (:inherit fixed-pitch :foreground ,variable))))
+ `(font-lock-warning-face ((t (:inherit error))))
+
+ ;; Org
+ `(org-level-1 ((t (:inherit default :foreground ,header :height ,(acme-dark--height 1.3)))))
+ `(org-level-2 ((t (:inherit default :foreground ,header :height ,(acme-dark--height 1.2)))))
+ `(org-level-3 ((t (:inherit default :foreground ,header :height ,(acme-dark--height 1.1)))))
+ `(org-level-4 ((t (:inherit default :foreground ,header :height ,(acme-dark--height 1)))))
+ `(org-level-5 ((t (:inherit default :foreground ,header :height ,(acme-dark--height 1)))))
+ `(org-level-6 ((t (:inherit default :foreground ,header :height ,(acme-dark--height 1)))))
+ `(org-level-7 ((t (:inherit default :foreground ,header :height ,(acme-dark--height 1)))))
+ `(org-level-8 ((t (:inherit default :foreground ,header :height ,(acme-dark--height 1)))))
+ `(org-meta-line ((t (:inherit fixed-pitch :foreground ,org-meta))))
+ `(org-document-info-keyword ((t (:inherit fixed-pitch :foreground ,org-document-info))))
+ `(org-document-info ((t (:inherit default :foreground ,org-document-info))))
+ `(org-verbatim ((t (:inherit fixed-pitch))))
+ `(org-table ((t (:inherit fixed-pitch :background ,org-table))))
+ `(org-formula ((t (:inherit org-table :height ,(acme-dark--height 1)))))
+ `(org-quote ((t (:inherit default :foreground ,org-quote-fg :background ,org-quote-bg))))
+ `(org-hide ((t (:inherit fixed-pitch :foreground ,bg))))
+ `(org-indent ((t (:inherit org-hide))))
+ `(org-date ((t (:inherit fixed-pitch :foreground ,org-date :underline nil))))
+ `(org-document-title ((t (:inherit default :foreground ,org-title :height ,(acme-dark--height 1.8) :underline (:color ,org-title-underline)))))
+ `(org-checkbox ((t (:inherit fixed-pitch :weight bold :foreground ,org-checkbox))))
+ `(org-scheduled ((t (:foreground ,org-scheduled))))
+ `(org-scheduled-today ((t (:foreground ,org-scheduled-today))))
+ `(org-done ((t (:inherit fixed-pitch :foreground ,org-done))))
+ `(org-todo ((t (:inherit fixed-pitch :foreground ,org-todo))))
+ `(org-tag ((t (:inherit fixed-pitch :height ,(acme-dark--height 1) :foreground ,org-tag))))
+ `(org-block-begin-line ((t (:inherit fixed-pitch :background ,org-block-line))))
+ `(org-block-end-line ((t (:inherit fixed-pitch :background ,org-block-line))))
+ `(org-block ((t (:background ,org-block-bg :inherit fixed-pitch))))
+ `(org-priority ((t (:inherit fixed-pitch :weight normal))))
+ `(org-agenda-structure ((t (:foreground ,org-agenda-structure-fg :background ,org-agenda-structure-bg :overline ,org-agenda-structure-bg :underline ,org-agenda-structure-bg))))
+ `(org-agenda-date-weekend ((t (:inherit org-agenda-structure))))
+ `(org-agenda-date-today ((t (:foreground ,org-agenda-today-fg :overline ,org-agenda-today-bg :background ,org-agenda-today-bg :underline ,org-agenda-today-bg))))
+ `(org-special-keyword ((t (:inherit fixed-pitch :foreground ,org-special-keyword))))
+ `(org-scheduled-previously ((t (:foreground ,org-sched-prev))))
+ `(org-agenda-done ((t (:foreground ,org-agenda-done))))
+ `(org-footnote ((t (:foreground ,link))))
+
+ ;; line numbers
+ `(line-number ((t (:inherit fixed-pitch :foreground ,linum))))
+ `(line-number-current-line ((t (:inherit fixed-pitch :foreground ,linum-hlt))))
+
+ ;; markdown
+ `(markdown-header-face-1 ((t (:foreground ,header :inherit default :height ,(acme-dark--height 1.5)))))
+ `(markdown-header-face-2 ((t (:foreground ,header :inherit default :height ,(acme-dark--height 1.4)))))
+ `(markdown-header-face-3 ((t (:foreground ,header :inherit default :height ,(acme-dark--height 1.3)))))
+ `(markdown-header-face-4 ((t (:foreground ,header :inherit default :height ,(acme-dark--height 1.23)))))
+ `(markdown-header-face-5 ((t (:foreground ,header :inherit default :height ,(acme-dark--height 1.23)))))
+ `(markdown-header-face-6 ((t (:foreground ,header :inherit default :height ,(acme-dark--height 1.23)))))
+ `(markdown-header-face-7 ((t (:foreground ,header :inherit default :height ,(acme-dark--height 1.23)))))
+ `(markdown-header-face-8 ((t (:foreground ,header :inherit default :height ,(acme-dark--height 1.23)))))
+ `(markdown-markup-face ((t (:inherit fixed-pitch :foreground ,markdown-markup))))
+ `(markdown-inline-code-face ((t (:inherit fixed-pitch))))
+ `(markdown-metadata-key-face ((t (:inherit fixed-pitch :height ,(acme-dark--height 1) :foreground ,markdown-metadata))))
+ `(markdown-metadata-value-face ((t (:inherit fixed-pitch :height ,(acme-dark--height 1) :foreground ,fg))))
+ `(markdown-language-keyword-face ((t (:foreground ,markdown-language))))
+ `(markdown-list-face ((t (:inherit fixed-pitch :foreground ,markdown-list))))
+ `(markdown-code-face ((t (:inherit fixed-pitch :foreground ,fg :background ,markdown-code-bg))))
+ `(markdown-pre-face ((t (:inherit fixed-pitch :color ,fg :background ,markdown-pre-bg))))
+ `(markdown-header-delimiter-face ((t (:inherit fixed-pitch :foreground ,markdown-header-delimiter))))
+ `(markdown-header-rule-face ((t (:inherit fixed-pitch :foreground ,markdown-header-delimiter))))
+ `(markdown-url-face ((t (:inherit fixed-pitch :foreground ,link))))
+
+ ;; ivy
+ `(ivy-current-match ((t (:inherit fixed-pitch :background ,hlt))))
+ `(ivy-minibuffer-match-face-1 ((t (:inherit fixed-pitch :foreground ,cyan))))
+ `(ivy-minibuffer-match-face-2 ((t (:inherit fixed-pitch :foreground ,red))))
+ `(ivy-minibuffer-match-face-3 ((t (:inherit fixed-pitch :foreground ,blue))))
+ `(ivy-minibuffer-match-face-4 ((t (:inherit fixed-pitch :foreground ,brown))))
+
+ ;; imenu
+ `(imenu-list-entry-face-0 ((t (:foreground ,imenu))))
+ `(imenu-list-entry-face-1 ((t (:foreground ,imenu))))
+ `(imenu-list-entry-face-2 ((t (:foreground ,imenu))))
+ `(imenu-list-entry-face-3 ((t (:foreground ,imenu))))
+ `(imenu-list-entry-face-4 ((t (:foreground ,imenu))))
+ `(imenu-list-entry-face-5 ((t (:foreground ,imenu))))
+
+ ;; Dired subtree
+ `(dired-subtree-depth-1-face ((t (:backround ,bg))))
+ `(dired-subtree-depth-2-face ((t (:backround ,bg-light))))
+ `(dired-subtree-depth-3-face ((t (:backround ,bg))))
+ `(dired-subtree-depth-4-face ((t (:backround ,bg-light))))
+ `(dired-subtree-depth-5-face ((t (:backround ,bg))))
+ `(dired-subtree-depth-6-face ((t (:backround ,bg-light))))
+
+ ;; Company
+ `(company-preview-common ((t (:underline nil))))
+ `(company-scrollbar-fg ((t (:background "#388E3C"))))
+ `(company-tooltip-common ((t (:inherit fixed-pitch :foreground nil :underline nil :weight bold))))
+ `(company-tooltip-common ((t (:underline nil))))
+ `(company-tooltip-common-selection ((t (:underline nil))))
+ `(company-tooltip-selection ((t (:background "#cee7cf"))))
+ `(company-tooltip-selection ((t (:background "#ddffdd"))))
+
+ ;; evil
+ `(evil-ex-substitute-replacement ((t (:foreground ,white-light :background ,brown-dark :underline nil))))
+ `(evil-goggles-delete-face ((t (:inherit 'lazy-highlight))))
+ `(evil-goggles-paste-face ((t (:inherit 'lazy-highlight))))
+ `(evil-goggles-yank-face ((t (:inherit 'lazy-highlight)))))
+
+ (custom-theme-set-variables 'acme-dark '(line-spacing 0.4)))))
+
+;;;###autoload
+(when (and (boundp 'custom-theme-load-path)
+ load-file-name)
+ (add-to-list 'custom-theme-load-path
+ (file-name-as-directory
+ (file-name-directory load-file-name))))
+
+(provide-theme 'acme-dark)
+;;; acme-dark-theme.el ends here
diff --git a/dots/.config/emacs/modules/module-ledger.el b/dots/.config/emacs/modules/module-ledger.el
@@ -53,7 +53,7 @@
("expenses monthly" "reg ^Expenses and not Tax -S T -p 'this year' --monthly --collapse")
("expenses month" "bal ^Expenses and not Tax --flat -S T -p 'last month'")
("expenses year" "bal ^Expenses and not Tax --flat -S T -p 'this year'")
- ("average" "bal ^Expenses -p 'this year' --monthly --average")
+ ("average" "reg -p 'this year' --monthly --average not Tax and ^Expenses")
("paystubs" "print Income:Salary")))))
(use-package flycheck-ledger
diff --git a/dots/.config/emacs/modules/module-notmuch.el b/dots/.config/emacs/modules/module-notmuch.el
@@ -53,6 +53,13 @@ the mail, but tag it for later deletion."
(notmuch-search-tag '("+deleted" "-unread"))
(next-line))
+(defun mjf/tree-tag-deleted ()
+ "Tag mail at point as deleted. This operation will not delete
+the mail, but tag it for later deletion."
+ (interactive)
+ (notmuch-tree-tag '("+deleted" "-unread"))
+ (next-line))
+
(defun mjf/delete-tagged-mail ()
"Delete mail that is tagged with the deleted tag"
(interactive)
@@ -66,6 +73,13 @@ the mail, but tag it for later deletion."
(shell-command "getmail --getmaildir=$HOME/.config/getmail")
(notmuch-poll-and-refresh-this-buffer))
+(defun mjf/offlineimap ()
+ "Fetch mail using getmail"
+ (interactive)
+ (message "Fetching mail...")
+ (shell-command "offlineimap")
+ (notmuch-poll-and-refresh-this-buffer))
+
(use-package notmuch
:bind
(:map notmuch-search-mode-map
@@ -73,10 +87,10 @@ the mail, but tag it for later deletion."
("D" . mjf/delete-tagged-mail)
("/" . notmuch-search))
(:map notmuch-tree-mode-map
- ("d" . mjf/tag-deleted)
+ ("d" . mjf/tree-tag-deleted)
("D" . mjf/delete-tagged-mail))
(:map notmuch-hello-mode-map
- ("r" . mjf/getmail))
+ ("r" . mjf/offlineimap))
:config
(add-hook 'notmuch-hello-mode-hook 'disable-line-numbers)
@@ -86,12 +100,16 @@ the mail, but tag it for later deletion."
(add-hook 'notmuch-tree-mode-hook 'disable-line-numbers)
(setq notmuch-saved-searches
- '((:name "inbox" :query "tag:inbox" :key "i")
- (:name "unread" :query "tag:unread" :key "u")
- (:name "all" :query "*" :key "a")
- (:name "deleted" :query "tag:deleted")
- (:name "sent" :query "tag:sent" :key "t")
- (:name "drafts" :query "tag:draft" :key "d"))))
+ '((:name "inbox" :query "tag:inbox" :key "i")
+ (:name "unread" :query "tag:unread" :key "u")
+ (:name "all" :query "*" :key "a")
+ (:name "deleted" :query "tag:deleted")
+ (:name "sent" :query "tag:sent" :key "t")
+ (:name "drafts" :query "tag:draft" :key "d")
+ (:name "work" :query "mark@getsunday.com tag:unread" :key "w" :search-type tree)
+ (:name "OpenBSD tech" :query "tech@openbsd.org tag:unread" :search-type tree)
+ (:name "OpenBSD misc" :query "misc@openbsd.org tag:unread" :search-type tree)
+ )))
(provide 'module-notmuch)
