Merge branch 'main' of git.sr.ht:~marcuskammer/emacs.d

This commit is contained in:
Marcus Kammer 2023-02-02 09:33:01 +01:00
commit 6ed098a1ee
4 changed files with 19 additions and 15 deletions

View file

@ -13,6 +13,18 @@
(when (eq system-type 'gnu/linux)
(use-package mu4e
:ensure nil
:init
(setq mu4e-headers-unread-mark '("u" . "📩 ")
mu4e-headers-draft-mark '("D" . "🚧 ")
mu4e-headers-flagged-mark '("F" . "🚩 ")
mu4e-headers-new-mark '("N" . "")
mu4e-headers-passed-mark '("P" . "")
mu4e-headers-replied-mark '("R" . "")
mu4e-headers-seen-mark '("S" . " ")
mu4e-headers-trashed-mark '("T" . "🗑️")
mu4e-headers-attach-mark '("a" . "📎 ")
mu4e-headers-encrypted-mark '("x" . "🔑 ")
mu4e-headers-signed-mark '("s" . "🖊 "))
:custom
(mu4e-change-filenames-when-moving t)
(mu4e-drafts-folder "/Drafts")
@ -23,18 +35,7 @@
(mu4e-trash-folder "/Trash")
(mu4e-split-view 'horizontal)
(mu4e-compose-signature "Cheers Marcus (Nuremberg . Germany)\nGnuPG Key: https://meta.sr.ht/~marcuskammer.pgp\nFingerprint: 86DB 0F30 F9F1 661A 54E2 1664 C374 817B E285 268F")
(mu4e-update-interval (* 10 60))
(mu4e-headers-unread-mark '("u" . "📩 "))
(mu4e-headers-draft-mark '("D" . "🚧 "))
(mu4e-headers-flagged-mark '("F" . "🚩 "))
(mu4e-headers-new-mark '("N" . ""))
(mu4e-headers-passed-mark '("P" . ""))
(mu4e-headers-replied-mark '("R" . ""))
(mu4e-headers-seen-mark '("S" . " "))
(mu4e-headers-trashed-mark '("T" . "🗑️"))
(mu4e-headers-attach-mark '("a" . "📎 "))
(mu4e-headers-encrypted-mark '("x" . "🔑 "))
(mu4e-headers-signed-mark '("s" . "🖊 "))))
(mu4e-update-interval (* 10 60))))
;; (setq mml-secure-openpgp-signers '("86DB0F30F9F1661A54E21664C374817BE285268F"))
;; (add-hook 'message-send-hook 'mml-secure-message-sign-pgpmime)

View file

@ -30,7 +30,7 @@
(add-hook 'Info-mode-hook (lambda () (make-local-variable 'olivetti-body-width) (setq olivetti-body-width 75) (olivetti-mode)))
(use-package ace-window :init (global-set-key (kbd "M-o") 'ace-window))
; (use-package ace-window :init (global-set-key (kbd "M-o") 'ace-window))
(use-package emojify :commands emojify-mode)

View file

@ -249,5 +249,7 @@
(use-package jabber)
(use-package hyperbole)
(load "bundle--irc")
(load "bundle--news")

View file

@ -57,7 +57,7 @@
'(org-roam-directory "~/Documents/notes/")
'(package-enable-at-startup t)
'(package-selected-packages
'(jabber ox-pandoc mastodon w3m spotify cider clojure-mode mpv markdown-mode csv-mode ox-reveal ob-go org-web-tools org-tree-slide org-roam elfeed erc-image magit go-translate simple-httpd slime racket-mode web-mode go-mode eglot nov vertico emojify ace-window olivetti rainbow-delimiters helpful doom-modeline doom-themes all-the-icons-dired all-the-icons use-package))
'(hyperbole ox-rss keepass-mode jabber ox-pandoc mastodon w3m spotify cider clojure-mode mpv markdown-mode csv-mode ox-reveal ob-go org-web-tools org-tree-slide org-roam elfeed erc-image magit go-translate simple-httpd slime racket-mode web-mode go-mode eglot nov vertico emojify ace-window olivetti rainbow-delimiters helpful doom-modeline doom-themes all-the-icons-dired all-the-icons use-package))
'(plantuml-default-exec-mode 'jar)
'(python-shell-interpreter "ipython")
'(python-shell-interpreter-args "-i --simple-prompt --InteractiveShell.display_page=True")
@ -72,6 +72,7 @@
[152 195 121]
[198 120 221]
[86 182 194]])
'(timeclock-file "~/Documents/journal/timelog")
'(user-mail-address "marcus.kammer@mailbox.org")
'(warning-suppress-log-types '((comp))))
(custom-set-faces
@ -80,4 +81,4 @@
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(font-lock-keyword-face ((t (:slant italic))))
'(variable-pitch ((t (:weight semi-light :height 1.2 :family "Roboto Slab")))))
'(variable-pitch ((t (:weight Regular :height 1.2 :family "Roboto Slab")))))