From 3f582c0777338328dd3e3e368ae0cb70d22f7d63 Mon Sep 17 00:00:00 2001 From: Jens Sauer Date: Thu, 28 Dec 2023 22:21:52 +0100 Subject: [PATCH 01/11] [gnupg] Update gpg.conf Since SKS keyservers are gone changing default keyserver to keyserver.ubuntu.com an honoring key server urls. --- gnupg/.gnupg/gpg.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnupg/.gnupg/gpg.conf b/gnupg/.gnupg/gpg.conf index 51ec818..9562afc 100644 --- a/gnupg/.gnupg/gpg.conf +++ b/gnupg/.gnupg/gpg.conf @@ -24,8 +24,9 @@ use-agent # # Keyserver # -keyserver hkps://hkps.pool.sks-keyservers.net -keyserver-options no-honor-keyserver-url +keyserver hkp://keyserver.ubuntu.com + +auto-key-retrieve #----------------------------- # algorithm and ciphers From 3bd6c555c63844a8c14a48b5a5e04652dc66bdf7 Mon Sep 17 00:00:00 2001 From: Jens Sauer Date: Thu, 28 Dec 2023 22:24:39 +0100 Subject: [PATCH 02/11] [shell]: Update .bashrs for updated base16-colors Missed updates to .bashrc for last update in commit 653775a86072ba2be7361b0101bcfb8dd6bfe5a9 --- shell/.bashrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/shell/.bashrc b/shell/.bashrc index 4d5e4ce..0ce67fe 100644 --- a/shell/.bashrc +++ b/shell/.bashrc @@ -130,4 +130,6 @@ fi BASE16_SHELL="$HOME/.config/base16-shell/" [ -n "$PS1" ] && \ [ -s "$BASE16_SHELL/profile_helper.sh" ] && \ - eval "$("$BASE16_SHELL/profile_helper.sh")" + source "$BASE16_SHELL/profile_helper.sh" + +base16_solarflare From ca39b6b5447b9892a5aaaff20be4069a794cb129 Mon Sep 17 00:00:00 2001 From: Jens Sauer Date: Thu, 28 Dec 2023 22:35:49 +0100 Subject: [PATCH 03/11] [mail]: Cleanup muttrc Remove unused options and obsolete configuration values. --- mail/.config/mutt/muttrc | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/mail/.config/mutt/muttrc b/mail/.config/mutt/muttrc index 161fdf0..4fed197 100644 --- a/mail/.config/mutt/muttrc +++ b/mail/.config/mutt/muttrc @@ -14,7 +14,6 @@ auto_view text/plain text/html alternative_order text/enriched text/plain text/html set realname="Jens Mathis Sauer" -# unset use_domain set send_charset = "utf-8" set header_cache = ~/.cache/mutt set message_cachedir = ~/.cache/mutt @@ -40,13 +39,6 @@ set smime_ca_location = /etc/ssl/certs/ca-certificates.crt set mail_check = 60 set timeout = 10 -#set net_inc = 5 -#set time_inc = 15 - -# set mbox_type = Maildir -# set folder = ~/mail -# set timeout = 20 -# set pager_stop = yes set index_format = "%4C [%Z] %{%b %d} %-15.15L %s" set confirmappend = no @@ -57,25 +49,6 @@ set print_command="muttprint" set wait_key = no unset folder - -#mailboxes +gmail/INBOX \ -# +gmail/mbox \ -# +gmail/sent \ -# +gmail/junk \ -# +gmail/LKLM \ -# +gmail/debian-user \ -# +gmail/debian-user-german \ -# +gmail/vfio-users \ -# "+------------------" \ -# +uni/INBOX \ -# +uni/archive \ -# +uni/sent \ -# +uni/postponed \ -# +uni/trash \ -# +uni/junk \ -# +uni/studip \ -# +uni/list-kohorte - # # Accounts # From 8b15447b97dfb16ed078468cc58738b78fa7208e Mon Sep 17 00:00:00 2001 From: Jens Sauer Date: Thu, 28 Dec 2023 22:38:04 +0100 Subject: [PATCH 04/11] [mail]: Use imap_idle Using imap_idle per default now. --- mail/.config/mutt/muttrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail/.config/mutt/muttrc b/mail/.config/mutt/muttrc index 4fed197..fb625b8 100644 --- a/mail/.config/mutt/muttrc +++ b/mail/.config/mutt/muttrc @@ -20,7 +20,7 @@ set message_cachedir = ~/.cache/mutt set imap_check_subscribed unset imap_passive set imap_keepalive = 120 -#set imap_idle +set imap_idle # crypto and GPG settings set crypt_use_gpgme From 56553357893bca7423404e2f8bfbd1bd8c646111 Mon Sep 17 00:00:00 2001 From: Jens Sauer Date: Thu, 28 Dec 2023 22:41:42 +0100 Subject: [PATCH 05/11] [mail]: Remove accounts from muttrc First commit in a series of commit to switch to seperate account file. This is needed to support multiple account on the same mail server in saner way. --- mail/.config/mutt/muttrc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mail/.config/mutt/muttrc b/mail/.config/mutt/muttrc index fb625b8..6de93ba 100644 --- a/mail/.config/mutt/muttrc +++ b/mail/.config/mutt/muttrc @@ -49,16 +49,6 @@ set print_command="muttprint" set wait_key = no unset folder -# -# Accounts -# -#source "~/.config/mutt/account-uni" -folder-hook imaps://imap.uni-oldenburg.de 'source ~/.config/mutt/account-uni' -macro index,pager \e2 "$folder" "Switch to UOL inbox" -#source "~/.config/mutt/account-gmail" -folder-hook imaps://imap.gmail.com 'source ~/.config/mutt/account-gmail' -macro index,pager \e1 "$folder" "Switch to GMail inbox" - # # Keybindings # From 19845eae5547ca0966bdc501259c3f969378e8f2 Mon Sep 17 00:00:00 2001 From: Jens Sauer Date: Thu, 28 Dec 2023 22:43:34 +0100 Subject: [PATCH 06/11] [mail]: Remove obsolete keybindings from muttrc --- mail/.config/mutt/muttrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/mail/.config/mutt/muttrc b/mail/.config/mutt/muttrc index 6de93ba..80ee358 100644 --- a/mail/.config/mutt/muttrc +++ b/mail/.config/mutt/muttrc @@ -52,9 +52,6 @@ unset folder # # Keybindings # -# macro index G "unset wait_keymbsync -a" "Syncronize Maildir" -# macro index,pager i1 "source ~/.config/mutt/account-gmail!" "Switch to gmail inbox" -# macro index,pager i2 "source ~/.config/mutt/account-uni!" "Switch to UOL inbox" macro index,pager S ">echo 'Archived mail.'" "Archive email" bind editor complete-query From f82d46cd531841fdc729b5b409f2724fbe93f6e8 Mon Sep 17 00:00:00 2001 From: Jens Sauer Date: Mon, 1 Jan 2024 15:00:28 +0100 Subject: [PATCH 07/11] [mail]: Change gmail account setting Change to use native SMTP and seperate from other mutt accounts. --- mail/.config/mutt/account-gmail | 15 +++++++-------- shell/.bash_aliases | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/mail/.config/mutt/account-gmail b/mail/.config/mutt/account-gmail index 3c0077b..c1a635d 100644 --- a/mail/.config/mutt/account-gmail +++ b/mail/.config/mutt/account-gmail @@ -1,10 +1,7 @@ # Mutt account for jsauer65@gmail.com -unalternates "*" -unsubscribe * -unlists * -unhook save-hook unset record +source ~/.config/mutt/muttrc # # Personal configuration @@ -17,15 +14,17 @@ set pgp_default_key = "0x850E29085C0B0084" # Gmail configuration # set hostname = "gmail.com" -set folder = "imaps://imap.gmail.com" +set folder = "imaps://jsauer65@gmail.com@imap.gmail.com" set spoolfile = "+INBOX" set mbox = "+mbox" #set postponed = +postponed set trash = '+[Google Mail]/Papierkorb' set imap_authenticators = "plain" - -account-hook $folder "set imap_user = 'jsauer65@gmail.com' imap_pass = '`gpg --decrypt --quiet --batch ~/.config/mutt/account-gmail-pass.asc`'" -set sendmail = "/usr/bin/msmtp -a gmail" +set smtp_authenticators = "plain" +set imap_user = "jsauer65@gmail.com" +set imap_pass = "`gpg --decrypt --quiet --batch ~/.config/mutt/account-gmail-pass.asc`" +set smtp_pass = $imap_pass +set smtp_url=smtp://$imap_user@smtp.gmail.com:587 # # Load confidential settings diff --git a/shell/.bash_aliases b/shell/.bash_aliases index e6de3ac..a8ed5c9 100644 --- a/shell/.bash_aliases +++ b/shell/.bash_aliases @@ -1,4 +1,4 @@ # bash aliases -alias muttg='mutt -f imaps://imap.gmail.com' +alias muttg='mutt -F ~/.config/mutt/account-gmail' alias mutto='mutt -f imaps://imap.uni-oldenburg.de' From 449ab42e2fed653d1edd2e5f1092a9726fa801bb Mon Sep 17 00:00:00 2001 From: Jens Sauer Date: Mon, 1 Jan 2024 15:22:34 +0100 Subject: [PATCH 08/11] [mail]: Update account uni * Native SMTP usage * Seperate from other mutt account * Change mail address --- mail/.config/mutt/account-uni | 18 ++++++++---------- shell/.bash_aliases | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/mail/.config/mutt/account-uni b/mail/.config/mutt/account-uni index 4d9156d..eb0586f 100644 --- a/mail/.config/mutt/account-uni +++ b/mail/.config/mutt/account-uni @@ -1,16 +1,12 @@ # Mutt account for jens.mathis.sauer@uni-oldenburg.de -unalternates "*" -unsubscribe * -unlists * -unhook save-hook -unset imap_authenticators +source ~/.config/mutt/muttrc # Personal configuration # -set from = "jens.mathis.sauer@uni-oldenburg.de" -alternates "^jens.mathis.sauer@uol\.de$" -set hostname = "uni-oldenburg.de" +set from = "jens.mathis.sauer@alum.uni-oldenburg.de" +alternates "^jens.mathis.sauer@alum\.uol\.de$" +set hostname = "alum.uni-oldenburg.de" set pgp_default_key = "0x7D98E633A4FFE8B7" # @@ -22,9 +18,11 @@ set record = "=Sent Items" set mbox = "=mbox" set postponed = "=Drafts" set trash = "=Deleted Items" -set sendmail = "/usr/bin/msmtp -a uni" -account-hook $folder "set imap_user = 'bodu0604' imap_pass = '`gpg --decrypt --quiet --batch ~/.config/mutt/account-uni-pass.asc`'" +set imap_user = "bodu0604" +set imap_pass = "`gpg --decrypt --quiet --batch ~/.config/mutt/account-uni-pass.asc`" +set smtp_url = smtp://$imap_user@smtp.uni-oldenburg.de:587 +set smtp_pass = $imap_pass # # Source confidential settings diff --git a/shell/.bash_aliases b/shell/.bash_aliases index a8ed5c9..c933da8 100644 --- a/shell/.bash_aliases +++ b/shell/.bash_aliases @@ -1,4 +1,4 @@ # bash aliases alias muttg='mutt -F ~/.config/mutt/account-gmail' -alias mutto='mutt -f imaps://imap.uni-oldenburg.de' +alias mutto='mutt -F ~/.config/mutt/account-uni' From 20ff221afdf0e3a5067b51edaa1d97f0e6539487 Mon Sep 17 00:00:00 2001 From: Jens Sauer Date: Mon, 1 Jan 2024 21:39:54 +0100 Subject: [PATCH 09/11] [mail]: Remove unused file --- mail/.config/mutt/account-gmail-save-hooks.gpg | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 mail/.config/mutt/account-gmail-save-hooks.gpg diff --git a/mail/.config/mutt/account-gmail-save-hooks.gpg b/mail/.config/mutt/account-gmail-save-hooks.gpg deleted file mode 100644 index dca1fca..0000000 --- a/mail/.config/mutt/account-gmail-save-hooks.gpg +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN PGP MESSAGE----- - -hQEMAxZqNlgllgKCAQgAx2QaixFVbAo4cCInfoZJaX7tA9iTdO3bmWKkc6Djpo2Q -eOyvqUIL76uPjW+aZcxOogRGE4PPSrl/9lGmwVZqAud/6MVjm0v0+UCNv0ZD2EDQ -91bS7rNywQUArLtJYCkZaw87lxxxuXLkzZzKQQoGVUqP0eJjnD/M62OjdQ4xn3+N -CxyLWVhdC291oUNkO1kxzs4w9Zyiuoy6xtQHNnPqpV9cazCV9iCLoLB5CpJkFXuG -k33/yMQJH4DYTWyoMl9iTJYuadQevioV2s7+i86BQ8mzqW4O+tL4G0KCYAL14Z/T -Mu611TRm11OkJ6S3wtCc4U/qxRZh+ExDmHlctkkrvNLACwHoeYf9xR/8YQdSAFyY -82s2gItffdxgn5sazzPphndr/G95Mf50NBjbh0p3qWBIUJgueIuw0nNNhE7ZcpJ3 -EpScjORAZiDTxlLepr846dso4YkAwQoQLnKan/b5KxtLZ++lpkzue6wfr+dOI6Gp -hl8u/u2ZhC4033me6QMf4y/9sZY9QNAptURK0AgRKyOFRto+irstfKec43ep51WY -00zsPRkhlmf8O8gss1mJkkb0ey2nR+YNZbeC9Zkqee1kYWuNKEcSBhx8m9eL -=bPKJ ------END PGP MESSAGE----- From e118e7b972dee79ab230c4ccbbc7d79b5bf9cd8e Mon Sep 17 00:00:00 2001 From: Jens Sauer Date: Mon, 1 Jan 2024 21:44:29 +0100 Subject: [PATCH 10/11] [mail]: Update GPG Key --- mail/.config/mutt/account-gmail | 2 +- .../mutt/account-gmail-confidential.asc | 30 ++++++++++--------- mail/.config/mutt/account-gmail-pass.asc | 20 +++++++------ mail/.config/mutt/account-uni | 2 +- .../.config/mutt/account-uni-confidential.asc | 24 ++++++++------- mail/.config/mutt/account-uni-pass.asc | 20 +++++++------ 6 files changed, 53 insertions(+), 45 deletions(-) diff --git a/mail/.config/mutt/account-gmail b/mail/.config/mutt/account-gmail index c1a635d..ef2f84e 100644 --- a/mail/.config/mutt/account-gmail +++ b/mail/.config/mutt/account-gmail @@ -8,7 +8,7 @@ source ~/.config/mutt/muttrc # set from = "jsauer65@gmail.com" alternates "^jsauer65@googlemail\.com$" -set pgp_default_key = "0x850E29085C0B0084" +set pgp_default_key = "0x76B8B786045CB34A" # # Gmail configuration diff --git a/mail/.config/mutt/account-gmail-confidential.asc b/mail/.config/mutt/account-gmail-confidential.asc index 20fb41c..c453a2b 100644 --- a/mail/.config/mutt/account-gmail-confidential.asc +++ b/mail/.config/mutt/account-gmail-confidential.asc @@ -1,17 +1,19 @@ -----BEGIN PGP MESSAGE----- -hQEMAxZqNlgllgKCAQgA21JS/8NouLTM2grRIX3S5eJ/pQkT7tG72Qs36bTPg++M -c44mzL4VkH9b2iKbSFM32BhRXV4DfWZ1LG5cDNBdlk6P3/H9KMxQW8QpEZ1y/d/J -zbNiQCsWeTjMP0vrpmW6HXElblJsBDRQ4eHhL6aUWi6CJU67ZiL33L+MmWQH/1jt -dNsgxOIUqaYqGuLlpJAvTEHlTp0EcFEI358yT/jopFwk+vNtOhPtMe7+bBRM0Ll8 -ID7ZoomMrKaxf+9aM3eNw6MfvvpQGyhUWlqmTQ+FejcnWpDMTiDCOHikt+ZgAh/e -qaBUV61/YkoMYYAF44AG/jq7MesJ/xapnE5IubiJvdLAkAGXqpLcajzBRSO0D+OF -gWix3XPI43m1KcxXC5JrvIO+GGg2LglxL6XQm1IhSiL5ozoaqlvq4ppmCiwLRbuH -OlEed+D4KJeiowwNRZs3dC8+CtoxGlVZILx/jN7/ff1UDW4iOkBBZt2Ln2TYEKxc -jxnlQJJKP2HDcVKvsXmXdaS7eu1eLhyflgSpwZEyAoM8mZB9vjMyYPrNLmlDQR/k -y+CxMq3GyymTBRlUw+pyqYee/Jg1H5qg+tBF2YvIQKHcaJ6JDRn4ssaaE9pZs9Ps -u4eZdZT78YVzUiSZgOq+QcBQ5Qzt2R2sV89guQIcpPwGc0fhQjI9XUDoip9EOloA -Qr+mcv9V6TPaMYYVwQbZ3wRUGGwGYb8eUrDVWHoAblzSmoHhW3lKnCHjECXtQ1WG -Ax3RrA6HoAeAIjpknbtt2DEtD7ctDvvo1Z/mqEUBF3dlIg== -=kNiy +hF4DW1wudff8pD4SAQdAmuzALYH5xILrgS9ofQdTJ1BCSQFkqAEhnDXrxci451ww +DwbrJHkObzijz7D0E9WppBFHqGH3U1vkrWiReJQZPwQrcvGp6W25JWyK72Ky08c1 +hQEMAxZqNlgllgKCAQgAx8hg3W2yACfuSyE9eGCjVfNl844VbrB7xQ6JIgAZpb0m +YjlqG+xy5FDAQ+IqwHjZ8p7HsGwTgJKcaaGelAnljP/u5d9YiC6knLTfBRIXUIN7 +W3kz7ncQjxMrbm1JU22+CcBTcLw611eOobWUosSadKvdbhGhkDzHrUIOsQKjsmJQ +6p/S9kjMprXcSPZmTvKX0b8FAw6gSlbaZskUB9mxNN4ren0/TomA/NohGxz/CMVP +qZk0mHVtwqGYFRVmIJIHS21dmlD6Y9bCNW4HgOGdoxwybGvtO+awLBa8QXJCW10U +lUPgsXoltTj3SxhhiXnoKgoB/s8bjFhsxHyI8gEBrtLAkAFIRV8W3b23tXw9Mn2Q +PRfnA+MsqCMQRh/mpGfHHiTSKQn94B8bW/NWXSam+ZoUcYcQbdUmtBpERPs8xqeL +wvqFYJ438sh1Cvx1Amxczw75IWv5qRQeWdDOy6MipbE/nf9TQgRfxcfyfgJZjrAc +2FMNIlPddriHPB5fA6+xEdQAH0BQyPMM+wftSdEck7hXEEIxGnHGBUIw/Z6rrAMh +906/5hoFahOb9s6ib8KQmYsLrR1I4e0rnvKgkIgHouXRE6Wt6C4GJOhx3ZwrS8ZS +QrpB55tllAhZJcB9yZfRB7fZEZMBu76t2/odi5hXxFvHgp9kSKGYkS48U6luGD1b +HJvXAT6AKclhtngrKnkFlbt+CikOFGJGzPV/0I5WL377rTNduzTHtCbnIlGEQBIp +ZVpV84oJS3+iw8mrXdbaDlxEHe6ettE1ZLJjBccGJKWFCw== +=Wxyu -----END PGP MESSAGE----- diff --git a/mail/.config/mutt/account-gmail-pass.asc b/mail/.config/mutt/account-gmail-pass.asc index 37ad2fe..0ed2c1e 100644 --- a/mail/.config/mutt/account-gmail-pass.asc +++ b/mail/.config/mutt/account-gmail-pass.asc @@ -1,12 +1,14 @@ -----BEGIN PGP MESSAGE----- -hQEMAxZqNlgllgKCAQgAqESM+hMkeXGWhvjuksqm5KrzdPt5amA6v7sHZTTAjzfx -ayi+VElNl7q2B9yuefNZ/Tri+0AH0NCagC2gXv4oEjx+0BoDKTXo8Vo3sEA4M+XL -QwovjgyLhLC3Me2B4Sr4Y8FAb7QeeEcfbxrv7JSCDJXjXwk9fAek9X3S+2zDTWBH -/6isz1tq8muHDFnVXRXf6iVzzW+0ziysTMy3cyqtZs1fNa+/PlkEHxdQUYlKjG6V -1CkIvlLg8IBzFR/3wOQpwioY7fPLHm9Tk7za6TPXbB2ADjD9wVMGWXG7uwnj3bTE -wzUZh1KQRHJeusCGDy3vt3f+kku4MyRr+Q0zT2OYP9JMAe9kXkGVmeuyYjRctw5I -SH7UyqbfFqQLksjCU1FyrcqIpiY9rOgNbUOytFt2wcyV8Qc5Ri+jEdzLFD8i0HHj -C69g9W5GB5Km2u94Ig== -=ug7m +hF4DW1wudff8pD4SAQdAvpe/VadesvqqC18GkiVE4+rNIsGCnUJLj9ogjuoaXQIw +5UCmVk/kGZOP+rlP5XHuTcfRgTpwLkcvh5xQOJC2gLAVosHEUtVUfxpGOxoaG3AG +hQEMAxZqNlgllgKCAQf/d6jLG85SpNgCXOH4aVY2YWM3+mZ51mNkPbP73bWLILMX +0s27mA2yMA7H5WaPN53th6tGQFRR0QWx+Teef9rO9G7fNVQnfjyEtpzi1Bf7xQ/5 +iOgHirmXJa2XoIBSLzCl071ZeRwiX2G7lrbl5vxTlvStRU/qFL8lEvhfrHGlM11F +Q4Wqi0Ky3QKsMxs+PgI8YRRpRLjZVUPrYx7Bm0u9UyDuiVtiOxKj7gDjw9rG+RX+ +3LIJ9GnvLz+Y+s5epZwWUOl35eiIsHSCI3doA5X+w00g3+6akT5bSSC8is9p+7Yu +XziYMqJqbcrIIPN+PBTpd6Wobdjnzr7U9g0TaBTPX9JMAXMsc1E5f5DoxCU4gXST +BD4JmWFp3PXJIeGGWw+B4FhbmpXBrt4DbkQx/Fp1B4oxbKnRfi4vYpb2lNXUh15f +I/ifNP/sFy4KC7JVpw== +=Vxou -----END PGP MESSAGE----- diff --git a/mail/.config/mutt/account-uni b/mail/.config/mutt/account-uni index eb0586f..c4de04a 100644 --- a/mail/.config/mutt/account-uni +++ b/mail/.config/mutt/account-uni @@ -7,7 +7,7 @@ source ~/.config/mutt/muttrc set from = "jens.mathis.sauer@alum.uni-oldenburg.de" alternates "^jens.mathis.sauer@alum\.uol\.de$" set hostname = "alum.uni-oldenburg.de" -set pgp_default_key = "0x7D98E633A4FFE8B7" +set pgp_default_key = "0x76B8B786045CB34A" # # Mail configuration diff --git a/mail/.config/mutt/account-uni-confidential.asc b/mail/.config/mutt/account-uni-confidential.asc index 728ecc5..b8ed89f 100644 --- a/mail/.config/mutt/account-uni-confidential.asc +++ b/mail/.config/mutt/account-uni-confidential.asc @@ -1,14 +1,16 @@ -----BEGIN PGP MESSAGE----- -hQEMAy5nJqctuavLAQgAgKGm25a9O7WDuZBOVBlOqM1zKGtOU/R7PaNk9ynA4jwU -2X28/dyu84J4lPHr6Dg46Z/dHmgi/v5Um2IaJ96hbKXWfrJJk51BJoB+DoUEi6NL -Zaw3+Izp2z5cEPsiwvjLv6Zooqng5Przh+wrR2y5lshSvcue9nrJSmCCnAxkVPeO -l4e/h7gIsTNKj6SXyU9xBDywixKcvOlEmFKLN63r87DoVxIB3emtX4UXUUf0WCS3 -nkRb/ePKHK0ytoD5N2ZRj3HdFLXAyjW5QC5MN6JwumcQcG+mGM40qomEM6TOEENI -ENfevp6ud9zJpc5Up/MxKJEoMtvilKZm1rm0ssqkU9LACAEngvTUWsJlZfqH3En4 -vOMv0MvImMoDK773dj1uhG+Qs3oJeUnm9+6lcLWzWqnFZ8IIgczWPNDd0W2u2W49 -qFlUS3B1VU4viUYKZebOIbfF3Ns0sGOHgMSe2uxGN/dHV0l3wO8Wvjc/pKNaywn3 -x4XV77yZuhOyOD8eiQlZJl/pcxi0VOnNKWnP/ufNzJ2hOqAcHyYlkuFk70Y2o/3Z -PY95ezKx2mBZcIIBeE4kfmtdTSHUfpzCYnPdaGKP8f4QzuBc/NrN/s5m -=ZCg3 +hF4DW1wudff8pD4SAQdAH9bRotiM97Jt9kwsux9qaQs2vhtORz/qisWg0Ky0dx0w +CuX1Mj7uU+wbvN+5Vep79n+S6n7g2yfTe6BIILxBgwIyNk2hA0qckwE2WFU8KQl0 +hQEMAxZqNlgllgKCAQf/aXrNueXGWlD93ile/MZKgI1neNdq/gqX/l+HR3kyC2qh +TPpOmurda4v+Lv918lci4ZjYtWnPZgXKEMgUqcwpMMNT03BZ4nQ62WhN6vWNSamv +mGpk9C59r0u5IAiDmIw9U9/UpcjvRuqW40G6PpVFiKyzr+cnMcUMvEEZeQF6sDqI +4eOaUi4nrizXRbC2w5fTKI6mDeVvEF8Jq/fgufBiiFqLPgI8lPKgqBeOyQ0mgXQh +KaYnoLm7BFnY4l2rqS0LOyZy4d7sEvCiMJPtfLlQkCVDMndGrCn/+miC+t4A3ErX ++YDhK8qtuMgxt5/h7qMWXIfnhC9iW1HXjssNF5PaVdLABwHY/ZPcyQ6WA7KpWivH +yfsL4mCCFyc3C6vDnccgTN6dhJihHmLwgZe/HCxZMhUCExh9/LkHTLa9OMtdHpXs +b3SjJz7xrPLiKULxkPm2zPqOgneAzc1lPNUVDgiL2GBqd1GGfgjo+hatBM6SfmTm +ZbK9EqAAP9RZGGTPiNoSEoWE9+AW2hlax67m4aZsPeGaNRiF2NSh2XPfzK3chhpM +YXFBUOUvrzziPIGz80btcXBdBHsmXat+tFLCYnEifLAvvnGD0eU8w8g= +=uDKc -----END PGP MESSAGE----- diff --git a/mail/.config/mutt/account-uni-pass.asc b/mail/.config/mutt/account-uni-pass.asc index d30cbf6..9df0310 100644 --- a/mail/.config/mutt/account-uni-pass.asc +++ b/mail/.config/mutt/account-uni-pass.asc @@ -1,12 +1,14 @@ -----BEGIN PGP MESSAGE----- -hQEMAy5nJqctuavLAQgArYFEhTf1Ljsbx6/Kqrurs1fPzac5XiwggVKh5FWtp6Fp -Hsq8gIdjTlM5knIuu6deji0dLHh3XEFgg808F3WfQsbHpogm+kIkitg4STbNv+g/ -Fs9PGmrKqmwDv5rvzQK9POeZGxdQX+zDXSr4e2Y/xbj1o3rTCakXBLhJsECQLN4B -DO6XWXw1U+tUmh7XIEqVgRwh5So0LUXhVFG5LTbnDQa/4GGIfjjQ75GwL9YSSL5+ -/KPcdbs81I6HTyvC9idziKyca/B8M+r2tVeBq5n5SZ7L8/KraZ396+96tbUNFDA/ -lTpevXXBD5iMrDZUX1VmE1CbPFBvT+U373QQJRoHO9JuAQTa3qpX2uaDyEpRZuo4 -X9kI1r7UWPCjIyfxipKp9+cO5rmY/HvPE1aJQr3thlgSAfz6VugUM4bAiWuETcdX -fyeVohNu9n9XFq30XbOvtmMAOwn8c2M9Gf9U5KiMXUzooU5RqjI/3A4qBBdz7l4= -=GHqp +hF4DW1wudff8pD4SAQdAd0UsD7qSGf0TX1z9bjvxajSK3kRpAh7EGZbA93cUUA0w +IWe5WwZGiOnNXa5KzkwLKKeT0g8nJRfOpjkOkAG/dZ66v21HTWI0EzHPBl1HEmvC +hQEMAxZqNlgllgKCAQgAjcqVrAUYy8AjgvoSFiqA62hEltYYNGBRkGpdUvWU3y+V +66ogeM+uMnBJfpOfO81ujyY7ApNjnu6j/J9TB/IEFTtIps76n+JgK4UA/6GHAJni +Oa6OY6+sjVjfEADOpDIU2fiz9Odwzp2GiY96mYJVERHe1L7fXooDWY+oSecB7hWQ +LyN1rXdaeQPa8OqDXU7b3pQzqhVfSoMZqvAOi5g6Y44vG8LlUHNIwki1O1sqbDUp +Fjxxcm6KYzbFgcYfl98deiiuD8W7eq4aIxq+co/PFdBvVw71ZVGYLgfNrnBNLQAk +8Ch6kSl+3yuuQh5mpAWyp+9RVS6REWvmdM77JbzWsNJuARsnp1M0CEirbDd+8+l0 +1Yf7xg6E3o45QBy/P0Y6lq9WFLc9JpsympDdApUoX6AhUHa/xfOxbQWvplBAJYKi +aV3D7y4kILJlNdiUGxEWuar3NGJLAldoI1tH/ZDrLyLh0DqrxLeE+vWbRSoSR14= +=XhTt -----END PGP MESSAGE----- From 12abfc75ebe5d1691939c70abe2ad187080a4a3b Mon Sep 17 00:00:00 2001 From: Jens Sauer Date: Mon, 1 Jan 2024 21:50:35 +0100 Subject: [PATCH 11/11] [mail]: Add jm@sauers.cc account --- mail/.config/mutt/account-sauers | 25 +++++++++++++++++++ .../mutt/account-sauers-confidential.asc | 14 +++++++++++ mail/.config/mutt/account-sauers-pass.asc | 14 +++++++++++ shell/.bash_aliases | 1 + 4 files changed, 54 insertions(+) create mode 100644 mail/.config/mutt/account-sauers create mode 100644 mail/.config/mutt/account-sauers-confidential.asc create mode 100644 mail/.config/mutt/account-sauers-pass.asc diff --git a/mail/.config/mutt/account-sauers b/mail/.config/mutt/account-sauers new file mode 100644 index 0000000..ee5083a --- /dev/null +++ b/mail/.config/mutt/account-sauers @@ -0,0 +1,25 @@ +# Mutt account for jm@sauers.cc + +source ~/.config/mutt/muttrc + +set from = "jm@sauers.cc" +alternates "^jm\+.+sauers.cc$" +set pgp_default_key = "0x76B8B786045CB34A" + +set hostname = "sauers.cc" +set imap_user = "jm@sauers.cc" +set imap_pass = "`gpg --decrypt --quiet --batch ~/.config/mutt/account-sauers-pass.asc`" +set smtp_pass = $imap_pass +set smtp_url = "smtp://$imap_user@mail.oxygin.net:587" +set folder = "imaps://$imap_user@mail.oxygin.net" +set spoolfile = "+INBOX" +set mbox = "+Archive" +set postponed = "+Drafts" +set record = "+Sent" + +# +# Load confidential settings +# +source "gpg --decrypt --quiet --batch ~/.config/mutt/account-sauers-confidential.asc|" + +# vim: filetype=muttrc diff --git a/mail/.config/mutt/account-sauers-confidential.asc b/mail/.config/mutt/account-sauers-confidential.asc new file mode 100644 index 0000000..298b668 --- /dev/null +++ b/mail/.config/mutt/account-sauers-confidential.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP MESSAGE----- + +hF4DW1wudff8pD4SAQdADBOWn4Uxn5hlovDFGz64p//mqeP9ggSAq94XNiK7BAQw +3SLPz8BMnt+zTHiFjQZLabygrD0xPFn+D1m0mtoC1ZMdyH7cCQ85NKsqOGRnbGQS +hQEMAxZqNlgllgKCAQf/c2ydhK2/IYbRSEvPGoIYw9MWDuoZC0WyIz9TOV299bsA +pCZSTOKvcIZee8iD5mAQdqjk9dvGE5TtOEm8Zkbxk5iget5dIFxEodsX0kVMhRoO +IOuVEybKsMQKdSQPLcvmYBVE1FIPI56K0r/7/MldaARoWiIlmSTQ2I21Ouamsj7s +W4bs0eWlrR72zD/IYtkayAOr4yJQa8uT+9cyn22W9ihcuYU6u13/6fydFaDPH3b3 +EQZlVmUAVw70UTGwnpo5k275F7S2xLlRG9lcEYcBzTw6UieZmzDgm0IfWMWlIroL +/92evj2arx+Q41eH54c+mUl9gg7v5LIIccr4bmtGqNJsAUK9wS+NuP8JvzrkkfzM +jt+nvwS4ZSVaj3u31hDa5xgMR+aN+Hn+RWpBaDRkZ9naX54XwhvX4XmSqzoz/5Kc +QdQw7QdHyQr+ke3bSx2Wk7tJpY3e9Vlx6HGr5VkiBRZQ8Jd7QxEAqRM5MeIR +=FCiO +-----END PGP MESSAGE----- diff --git a/mail/.config/mutt/account-sauers-pass.asc b/mail/.config/mutt/account-sauers-pass.asc new file mode 100644 index 0000000..94dbbb0 --- /dev/null +++ b/mail/.config/mutt/account-sauers-pass.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP MESSAGE----- + +hF4DW1wudff8pD4SAQdATUtKCpBMsCh00dLVGDh/rHM0jgluDyBwKuLOeJC6mVMw +Uog9YByeUg+Sa37tdmcClIDBZaeNA+JZwADfvsDaHmAx7wmSHcd+8Asug/hd0Ec5 +hQEMAxZqNlgllgKCAQf8DCl0IFVPzgTJdQWxdESKOk6H6TzcT01VjL45G1vFmPqb +vLPmVUFFoRo1gmjAByEJmTnAhiUUNu4LDjRxL+qtoumKZijKcVIKp1+fnGU37blF +7XvobSchvCli7FKcSY/T2u/DbSuhYUzhQQQLn6poE3emZy3P0TayiyJxrYjdEkty +vRPzC/B/moK2+JSFGAEE9gJzCI0RRIdRzpT5FugWaSsWKkpJ8WXhfcCxg4Ik7Hhm +DvTifjPyCBDi7igFY3yvRMpfx8EeK6zsH0VW1U1gS8/KiDHV736zLzBZgtWMHQbC +ycX3PeYCWg/OsCMGN/FUoiM+XH+qjMdZZQawwvfvf9JOARbpdxbHDqKp/ZIrbNvR +oWakhg4+brNTCgp6+CqXtCHqLzopGIBgt4rVF97tmThTsdJemm2JCOYOM8c6QXIY +0/Peb2pGjVSJ/Xx8O9ke +=sT+n +-----END PGP MESSAGE----- diff --git a/shell/.bash_aliases b/shell/.bash_aliases index c933da8..a7754b2 100644 --- a/shell/.bash_aliases +++ b/shell/.bash_aliases @@ -2,3 +2,4 @@ alias muttg='mutt -F ~/.config/mutt/account-gmail' alias mutto='mutt -F ~/.config/mutt/account-uni' +alias mutts='mutt -F ~/.config/mutt/account-sauers'