Reorganize account.neomuttrc

roles/neomutt/files/switch.neomuttrc

@@ -1,5 +0,0 @@
-unset hostname
-unmy_hdr Organization
-unmailboxes *
-unalternates *
-unset signature

roles/neomutt/templates/account.neomuttrc.j2

@@ -2,8 +2,15 @@
 
 set real_name = "{{ account.realname }}"
 set from = "{{ account.fulladdress }}"
-set sendmail = "msmtp -a {{ 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 }}"
+
+# IMAP
 {% if account.imap %}
 set folder = "{{ account.imap.proto }}://{{ account.imap.login }}@{{ account.imap.server }}:{{ account.imap.port }}"
 {% else %}
@@ -12,21 +19,15 @@ set folder = "/home/{{ ansible_facts['env']['USER'] }}/.local/share/mail/{{ acco
 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 hostname = "{{ account.fulladdress | split('@') | last }}"
-source /home/{{ ansible_facts['env']['USER'] }}/.config/neomutt/switch.neomuttrc
 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 }}`"
 {% endif %}
 
-set smtp_pass = "`pass {{ account.passlocation }}`"
-set smtp_url = "{{ account.smtp.proto }}://{{ account.smtp.login }}@{{ account.smtp.server }}:{{ account.smtp.port }}"
-
 set ssl_starttls = yes
 set ssl_force_tls = yes