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

bundle/bundle--email.el

@@ -27,8 +27,13 @@
   ;; (setq mml-secure-openpgp-signers '("86DB0F30F9F1661A54E21664C374817BE285268F"))
   ;; (add-hook 'message-send-hook 'mml-secure-message-sign-pgpmime)
 
-  (defun me/sign-email ()
+  (defun mk/sign-email ()
     ;; Sign an Email using the key of the sender.
     (interactive)
     (setq mml-secure-openpgp-sign-with-sender t)
-    (mml-secure-message-sign-pgpmime)))
+    (mml-secure-message-sign-pgp))
+
+  (defun mk/encrypt-email ()
+    ;; Encrypt an Email using the key of the recipient.
+    (interactive)
+    (mml-secure-message-encrypt-pgp)))

bundle/custom_gnu.el

@@ -43,6 +43,7 @@
  '(initial-frame-alist '((fullscreen . maximized)))
  '(ispell-dictionary "de_DE,de_CH,en_GB,en_US")
  '(ispell-program-name "hunspell")
+ '(message-user-organization "")
  '(org-agenda-files '("~/Documents/journal/"))
  '(org-babel-python-command "python3")
  '(org-directory "~/Documents/journal/")