From 1530933d8d98e6ae402d0eb627425b07783bf6cd Mon Sep 17 00:00:00 2001 From: jao Date: Thu, 5 Oct 2023 19:03:05 +0100 Subject: proton mail tweaks --- custom/jao-custom-email.el | 5 +++++ custom/jao-custom-gnus.el | 9 --------- init.el | 4 ++-- lib/net/jao-proton-utils.el | 14 ++++++++++++-- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/custom/jao-custom-email.el b/custom/jao-custom-email.el index 928c481..373d895 100644 --- a/custom/jao-custom-email.el +++ b/custom/jao-custom-email.el @@ -25,6 +25,9 @@ (when (file-newer-than-file-p org-file gnus-init-file) (org-babel-tangle-file org-file))) +;;; proton +(use-package jao-proton-utils) + ;;; message mode ;;;; customization (setq message-send-mail-function 'message-send-mail-with-sendmail @@ -214,6 +217,8 @@ (defun jao-sendmail-local () (setq send-mail-function 'sendmail-send-it) (setq smtpmail-auth-supported nil) ;; (cram-md5 plain login) + (setq smtpmail-servers-requiring-authorization nil) + (setq smtpmail-smtp-user nil) (setq smtpmail-smtp-server "127.0.0.1") (setq smtpmail-smtp-service 25)) diff --git a/custom/jao-custom-gnus.el b/custom/jao-custom-gnus.el index f344465..abe8ab8 100644 --- a/custom/jao-custom-gnus.el +++ b/custom/jao-custom-gnus.el @@ -195,15 +195,6 @@ nnml-get-new-mail t nnml-directory message-directory) -;; (when jao-gnus-use-pm-imap -;; (add-to-list 'mail-sources -;; '(imap :server "127.0.0.1" :port 1143 :user "jaor@pm.me" -;; ;; :mailbox ("Labels/#inbox" "Labels/#hacking" "Labels/#bills" -;; ;; "Labels/#drivel" "Labels/#prog" "Labels/#words") -;; :mailbox ("Labels/words" "Folders/test") -;; ;; :predicate "UNSEEN" -;; ))) - (when jao-gnus-use-nnml (add-to-list 'gnus-secondary-select-methods diff --git a/init.el b/init.el index ada2a25..b97c35b 100644 --- a/init.el +++ b/init.el @@ -3201,7 +3201,7 @@ ["Monitors" ("p" "htop" jao-term-htop) ("v" "vpn status" jao-mullvad-status) - ("m" "set tmr" tmr) + ;; ("m" "set tmr" tmr) ("x" "restart i3bar" jao-river-restart-i3bar :if jao-river-enabled-p) ("x" "restart xmobar" jao-xmobar-restart :if jao-exwm-enabled-p) ("x" "kill xmobar" jao-xmobar-kill :if jao-xmonad-enabled-p)] @@ -3209,7 +3209,7 @@ ("S" "ssh" jao-ssh) ("b" "bluetooth" bluetooth-list-devices) ("c" "connect chats" jao-all-chats) - ;; ("N" "network interfaces" enwc) + ("m" "proton bridge" run-proton-bridge) ] ["Chats" ("t" "telegram" jao-chats-telega) diff --git a/lib/net/jao-proton-utils.el b/lib/net/jao-proton-utils.el index 012a2ff..62b97b3 100644 --- a/lib/net/jao-proton-utils.el +++ b/lib/net/jao-proton-utils.el @@ -1,6 +1,6 @@ ;; jao-proton-utils.el -- simple interaction with Proton mail and vpn -;; Copyright (c) 2018, 2019, 2020 Jose Antonio Ortega Ruiz +;; Copyright (c) 2018, 2019, 2020, 2023 Jose Antonio Ortega Ruiz ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -40,7 +40,17 @@ (unless (eq major-mode 'proton-bridge-mode) (proton-bridge-mode))) -(defvar proton-vpn-mode-map) +;;;###autoload +(defun proton-bridge-sendmail-setup () + "Configure message sending for local proton bridge." + (setq send-mail-function #'smtpmail-send-it) + (setq message-send-mail-function #'smtpmail-send-it) + (setq smtpmail-servers-requiring-authorization + (regexp-opt '("localhost" "127.0.0.1"))) + (setq smtpmail-auth-supported '(plain login)) + (setq smtpmail-smtp-user "mail@jao.io") + (setq smtpmail-smtp-server "localhost") + (setq smtpmail-smtp-service 1025)) (defvar jao-proton-vpn-font-lock-keywords '("\\[.+\\]")) -- cgit v1.2.3