From 6a8c5893d4de83bbbbfd4f24c454e246befcdcc8 Mon Sep 17 00:00:00 2001
From: "flyingscorpio@clevo" <tfranken@protonmail.com>
Date: Thu, 12 May 2022 22:23:42 +0200
Subject: [PATCH] Update mutt config, set defaults for additionnal variables

---
 roles/neomutt/templates/account.neomuttrc.j2 | 31 +++----
 roles/neomutt/templates/neomuttrc.j2         |  7 +-
 roles/neomutt/vars/vault.yml                 | 91 +++++++++++---------
 3 files changed, 68 insertions(+), 61 deletions(-)

diff --git a/roles/neomutt/templates/account.neomuttrc.j2 b/roles/neomutt/templates/account.neomuttrc.j2
index 521c862..f01c980 100644
--- a/roles/neomutt/templates/account.neomuttrc.j2
+++ b/roles/neomutt/templates/account.neomuttrc.j2
@@ -1,33 +1,30 @@
-# neomuttrc file for account {{ account.fulladdress }}
+# neomuttrc file for {{ account.fulladdress }}
 
-set real_name = "{{ account.realname }}"
-set from = "{{ account.fulladdress }}"
-alias me {{ account.realname }} <{{ account.fulladdress }}>
 set hostname = "{{ account.fulladdress | split('@') | last }}"
 
 # SMTP
 #set sendmail = "msmtp -a {{ account.fulladdress }}"
 set smtp_pass = "`pass {{ account.passlocation }}`"
 set smtp_url = "{{ account.smtp.proto }}://{{ account.smtp.login }}@{{ account.smtp.server }}:{{ account.smtp.port }}"
+set real_name = "{{ account.realname }}"
+set from = "{{ account.fulladdress }}"
+set use_from = yes
 
 # IMAP
 {% if account.imap %}
-set folder = "{{ account.imap.proto }}://{{ account.imap.login }}@{{ account.imap.server }}:{{ account.imap.port }}"
-{% else %}
-set folder = "/home/{{ ansible_facts['env']['USER'] }}/.local/share/mail/{{ account.fulladdress }}"
-{% endif %}
-set header_cache = "/home/{{ ansible_facts['env']['USER'] }}/.cache/neomutt/{{ account.fulladdress }}/headers"
-#set message_cachedir = "/home/{{ ansible_facts['env']['USER'] }}/.cache/neomutt/{{ account.fulladdress }}/bodies"
-set mbox_type = Maildir
-set spool_file = +INBOX
-set record = +INBOX.Sent
-set postponed = +INBOX.Drafts
-set trash = +INBOX.Trash
-set imap_check_subscribed
-{% if account.imap %}
 set imap_user = "{{ account.imap.login }}"
 set imap_pass = "`pass {{ account.passlocation }}`"
+set folder = "{{ account.imap.proto }}://{{ account.imap.login }}@{{ account.imap.server }}:{{ account.imap.port }}"
+{% else %}
+set folder = "~/.local/share/mail/{{ account.fulladdress }}"
 {% endif %}
+set header_cache = "~/.cache/neomutt/{{ account.fulladdress }}/headers"
+set mbox_type = Maildir
+set spool_file = "{{ account.other_vars.spool_file | default('+INBOX') }}"
+set record = "{{ account.other_vars.record | default('+Sent') }}"
+set postponed = "{{ account.other_vars.postponed | default('+Drafts') }}"
+set trash = "{{ account.other_vars.trash | default('+Trash') }}"
+set imap_check_subscribed
 
 set ssl_starttls = yes
 set ssl_force_tls = yes
diff --git a/roles/neomutt/templates/neomuttrc.j2 b/roles/neomutt/templates/neomuttrc.j2
index 87cf04b..0c1708e 100644
--- a/roles/neomutt/templates/neomuttrc.j2
+++ b/roles/neomutt/templates/neomuttrc.j2
@@ -17,7 +17,8 @@
 #set forward_quote		# include message in forwards
 #set reverse_name		# reply as whomever it was to
 #set include			# include message in replies
-set mail_check=120              # how often to check for new mail
+set mail_check = 120            # how often to check for new mail (in seconds)
+set imap_keepalive = 300        # intermittent polling to keep connection alive (in seconds)
 #auto_view text/html		# automatically show html (mailcap uses lynx)
 #auto_view application/pgp-encrypted
 #alternative_order text/plain text/enriched text/html
@@ -175,6 +176,6 @@ set sidebar_visible = yes
 #color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
 
 {% for account in accounts %}
-source /home/{{ ansible_facts['env']['USER'] }}/.config/neomutt/accounts/{{ account.fulladdress }}.neomuttrc
-#macro index,pager i1 '<sync-mailbox><enter-command>source /home/{{ ansible_facts['env']['USER'] }}/.config/neomutt/accounts/{{ account.fulladdress }}.neomuttrc<enter><change-folder>!<enter>;<check-stats>' "switch to {{ account.fulladdress }}"
+source ~/.config/neomutt/accounts/{{ account.fulladdress }}.neomuttrc
+#macro index,pager i1 '<sync-mailbox><enter-command>source ~/.config/neomutt/accounts/{{ account.fulladdress }}.neomuttrc<enter><change-folder>!<enter>;<check-stats>' "switch to {{ account.fulladdress }}"
 {% endfor %}
diff --git a/roles/neomutt/vars/vault.yml b/roles/neomutt/vars/vault.yml
index 81d3650..9eb20f2 100644
--- a/roles/neomutt/vars/vault.yml
+++ b/roles/neomutt/vars/vault.yml
@@ -1,42 +1,51 @@
 $ANSIBLE_VAULT;1.1;AES256
-34383862663631623164363166356566343861626230333463343331626361316135666634653261
-3636363834636637626535646439306266623039313864630a653862316235336266663633383838
-62393563333364656566616166333661316132633831396138386636613832376664653731333736
-3430343964353963380a366437656164663663363834663738626665316362313561373333616635
-30666631366439373435663033643663336461376163356336383964653430383865396136346534
-33346265323537343161323430306230343535633434666333316136356332336633343538383162
-39353134636461623562653330376332396239356631366332616237633536373735313538616233
-37303563376136363534636430383866353831303338346566353539666535326233656139656561
-36383732313233336533663533333065653365303838313635353730343236353564353836366261
-36363861373765303435356261323235633036333935616135363834613265333536656533656331
-34303237396437326232656631663035616532666432356238353562363034386237386438363261
-33346634303130373430333930343562383139646538303834386337316537383931373261623936
-36653863663566616365353362343932316435366461663236313831383666646562366532353561
-30343436303334373730633961343939323838306436323232366663383737383066303166616665
-36393331343631303538316338626131383436323039366432333533646133303263303235353636
-32323739646432666363393033353537376165326236336132376365623634653438346333386134
-30333533366436316163623838366331653236363163663464306435306337353632633831643030
-61323563636466373537616165366462633833363462386131313162386338613834383134336334
-63393664306564383133313963393233656336633936353836313661343966346563343434636534
-31626562363437666636306531643264396436666637663939376139356634323232333835366264
-34323537343761326661343963623233373333376335613663303161343534383637393030343136
-63366434383036333262633866393636396239653463383133303263343033393864393766366438
-64303935396532623536663735346163366161666463373466616264616432313737326636353036
-64363566623930623964623537313862386661613364663635646138643732323132393266613337
-65323439326330326339643338336631343535396437616465353835346633663766326138363431
-30356361616235393134653361323836383163663534343735356134343439653164366664343166
-64343735336462306566323434656532633064663763313432653361373234666330313539363364
-30633866626464383236336632613665333130393836613862393537396161643332373062636338
-35613435633364613634393962313464393830623930346136646464616261363936363339623435
-31353336346464666466653430353030373532383464323462663561353463353130306138643733
-66366264643530326139626661623337363336653861336133323136396465626564356532616438
-62663539303965343230656531643830663438373061323934326362313637663262346131663739
-39623337336665643039346631656637663838303739656139383037373339383235393634336261
-62326438376630336464636636363065383937323065326231396239626631653135383532653832
-30626666366438306337633832663933326266363631386234336366386138386161356664333636
-38613036386534396336663364323136613262323539376630383164386362383934326536363866
-36623161636233383833613730626635653837343934373265636536616163346661336264353230
-64666266303931303134333863623632663362363163393438613133393336323832613333366638
-31653036333433333634306434656361646166303730363535363837313534326439663461376439
-62326465323463653265396232356130393263636564383261373636356662623161323161316333
-30333235373330356561656331656637393263333063363963376138646637623131
+30393533383831613434343463353564353136656136616632306566306636643433363835656161
+3266363637343465373566343634666433333462366634660a323636623766363333663236393165
+32656365636536346161356239656364643531646365396633366262636331393161623165383664
+3435666138656139370a303234323538373031313662306338386334343430663333353162323330
+33653430386638333665393164383538363365663561383036313035643364333734313165653238
+62663031666265373538393939636266656561383764623865653866316633616432396662663731
+65386538383331663336663561323239353235366136333336386533323761643265666562653562
+64393238346134303832616234653732623461346663313265613633663665353533336238333264
+30363036633438313939336461363739333137626164313234353431373731336235346132636438
+34366163366365373465313231323139363838363263646261663966376635356363373531336239
+34303262626435613934303537646563616163363038383365663362366137343163326564336130
+61383466323433343361353131396665373364653364653964356639326331653336616266643133
+38393836383266343535363634333132303937396130623632353665623332316530643030303738
+61383731316634313463363532306634393235366166333430366464633937303062376130663133
+66366431633066363766313237386234393664613837626437316330393066643631356563613332
+37343238633731363661356338643264346364336530633961303062316133643862323565383865
+66663735613863316565623730373934356435653438653765363966616139616465626463613031
+31303562626465333865356134303236343364653065386236323432353232343762303537646162
+64393364643739376161636536656637333463343739386536666136316130323766373832333162
+64313562356637373834393138613738373634653438646461333932643732343961636237663564
+66316365363339633430356265663266343864636532306633303366386662356661363661326131
+66666138356537323663643234336438373735366234333435623965663566663532396161356436
+66396632616539326564303738613363303537613036316532613539316633333638353637323632
+63383332346237396634326537373165653531313534613039346662636631656266326135353539
+35623862373538376561303331613239313666633565666631353739303264656462363538656239
+64343430356363363763353138646535313835336333663737373230613664656665363330313237
+31353536373433366338393166373865633537373565346239323861393465653365313935633230
+37346533633734376332393835633735613039633835666566353436376531616138646633363562
+62306165363433623733613633313131643966613130393531303038343162303461393065316634
+64656136653064313038333632376634643537633736393939386136626561343834373761366531
+35313735393435616466333633333834346639396531366665643134336363353339393133363161
+34656439373436626136626462653735343930366163633765633330396630386466363333333363
+33356432366430313438666336316561366239393362386136383930303632343131366165346566
+34636262343331623833313934663061633964663430393434636632643734376634353664653432
+36613132633566613931366163653661663233623836616666346264353963333562636164353135
+38623734393163326263313730323430313139633563386464333334333938343063393138333661
+34326538633834623839366330373264636364326632336361303533393464333361623833336339
+62326461373135636366373334356266313937663761356538386236353263333164343661376130
+63643562356630383131646561326239623063303833353365666339353638623532323337613135
+34363833396535646334306632653636323135626465353431393264373461303338333637636664
+33616530303766396431346638633032386631643232396530613430623463333161383661613062
+36653337346134326435616630643666353836663736663663356166653535626130613030346336
+36383932393165373032353439613065643435656632666232316163613431653065653836393062
+64643761636563646532316461376431636564386430663630346439613262626436616335346536
+35386535333161316233393865396631393762623330663739643431626438643563336161333165
+33656130353366383666663239633566336532393263366663396430363234386638303462316137
+62643239623137333966616137623837346132643139333330643065356630306662353562353137
+35363237633732323162343630313637636663383562613666376135663435383532366637373934
+39633030633762333664323066316663393938613932393239383366633338633463633264623130
+6463313136653630646334666462646463323237393064363065