From 1584607fb9c0d7d8c151509573c3447f17f42ec8 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 14 Dec 2019 14:56:13 +0000 Subject: chore: Remove some configuration from a previous life --- infra/nixos/dotfiles/msmtprc | 8 -------- infra/nixos/dotfiles/notmuch-config | 4 ++-- infra/nixos/dotfiles/offlineimaprc | 24 +----------------------- infra/nixos/mail.nix | 8 +------- tools/emacs/init/mail-setup.el | 12 ++---------- 5 files changed, 6 insertions(+), 50 deletions(-) diff --git a/infra/nixos/dotfiles/msmtprc b/infra/nixos/dotfiles/msmtprc index c6a9a7426a6e..624b6a77fc4b 100644 --- a/infra/nixos/dotfiles/msmtprc +++ b/infra/nixos/dotfiles/msmtprc @@ -4,14 +4,6 @@ port 587 tls on tls_trust_file /etc/ssl/certs/ca-certificates.crt -# Aprila mail -account aprila -from vincent@aprila.no -host smtp.office365.com -auth on -user vincent@aprila.no -passwordeval pass show aprila/office365-mail - # Runbox mail account runbox from mail@tazj.in diff --git a/infra/nixos/dotfiles/notmuch-config b/infra/nixos/dotfiles/notmuch-config index eb8b2c79bb13..a490774e635f 100644 --- a/infra/nixos/dotfiles/notmuch-config +++ b/infra/nixos/dotfiles/notmuch-config @@ -7,8 +7,8 @@ path=/home/vincent/mail [user] name=Vincent Ambo -primary_email=vincent@aprila.no -other_email=mail@tazj.in;tazjin@gmail.com; +primary_email=mail@tazj.in +other_email=tazjin@gmail.com; [new] tags=unread;inbox; diff --git a/infra/nixos/dotfiles/offlineimaprc b/infra/nixos/dotfiles/offlineimaprc index dd4752f4c36f..78315447e4bd 100644 --- a/infra/nixos/dotfiles/offlineimaprc +++ b/infra/nixos/dotfiles/offlineimaprc @@ -1,32 +1,10 @@ [general] -accounts = aprila, tazjin, gmail +accounts = tazjin, gmail [DEFAULT] ssl = yes sslcacertfile = /etc/ssl/certs/ca-certificates.crt -# Main work account: -[Account aprila] -localrepository = aprila-local -remoterepository = aprila-remote - -[Repository aprila-local] -type = Maildir -localfolders = ~/mail/aprila - -[Repository aprila-remote] -type = IMAP -remotehost = outlook.office365.com -remoteuser = vincent@aprila.no -remotepassfile = ~/.config/mail/aprila-pass -# Office365 is a naughty boy when it comes to IMAP. Even worse, they -# also seem to have decided that they should change IMAP folder names -# based on the UI language. -# -# I can't be bothered to implement the entire (relatively long) -# blacklist, so I'll instead whitelist relevant folders: -folderfilter = lambda folder: folder in ['INBOX', 'Arkiv', 'Sende element'] - # Private GMail account (old): [Account gmail] maxage = 90 diff --git a/infra/nixos/mail.nix b/infra/nixos/mail.nix index a9375a1eea4d..ba4ebfa06026 100644 --- a/infra/nixos/mail.nix +++ b/infra/nixos/mail.nix @@ -25,17 +25,11 @@ tagConfig = pkgs.writeText "notmuch-tags" '' # Tag nix-devel mailing list & discourse: -inbox +nix-devel -- to:nix-devel@googlegroups.com OR from:nixos1@discoursemail.com - # Filter out Gitlab mails: - -inbox +gitlab -- from:gitlab@aprila.no - # Tag my own mail (from other devices) as sent: - -inbox +sent -- folder:"aprila/Sende element" OR from:vincent@aprila.no OR from:mail@tazj.in + -inbox +sent -- from:mail@tazj.in # Drafts are always read, duh. -unread -- tag:draft - - # Tag development list - -inbox +aprila-dev -- to:dev@aprila.no OR cc:dev@aprila.no ''; notmuchIndex = pkgs.writeShellScriptBin "notmuch-index" '' diff --git a/tools/emacs/init/mail-setup.el b/tools/emacs/init/mail-setup.el index 1700ccddd37d..71cfb92ff53c 100644 --- a/tools/emacs/init/mail-setup.el +++ b/tools/emacs/init/mail-setup.el @@ -20,8 +20,6 @@ ;; Show me saved searches that I care about: (setq notmuch-saved-searches '((:name "inbox" :query "tag:inbox" :count-query "tag:inbox AND tag:unread" :key "i") - (:name "aprila-dev" :query "tag:aprila-dev" :count-query "tag:aprila-dev AND tag:unread" :key "d") - (:name "gitlab" :query "tag:gitlab" :key "g") (:name "sent" :query "tag:sent" :key "t") (:name "drafts" :query "tag:draft"))) (setq notmuch-show-empty-saved-searches t) @@ -44,12 +42,7 @@ ;; Store sent mail in the correct folder per account (setq notmuch-maildir-use-notmuch-insert nil) -(setq notmuch-fcc-dirs '(("mail@tazj.in" . "tazjin/Sent") - ;; Not a mistake, Office365 apparently - ;; renames IMAP folders (!) to your local - ;; language instead of providing translations - ;; in the UI m( - ("vincent@aprila.no" . "aprila/Sende element"))) +(setq notmuch-fcc-dirs '(("mail@tazj.in" . "tazjin/Sent"))) ;; I don't use drafts but I instinctively hit C-x C-s constantly, lets ;; handle that gracefully. @@ -78,8 +71,7 @@ (when (> (- (float-time) *last-notmuch-count-redraw*) 30) (setq *last-notmuch-count-redraw* (float-time)) (let* ((inbox-unread (notmuch-saved-search-count "tag:inbox and tag:unread")) - (devel-unread (notmuch-saved-search-count "tag:aprila-dev and tag:unread")) - (notmuch-count (format "I: %s; D: %s" inbox-unread devel-unread))) + (notmuch-count (format "I: %s; D: %s" inbox-unread))) (setq *current-notmuch-count* notmuch-count))) (when (and (bottom-right-window-p) -- cgit 1.4.1