From 741a7f300be67b3e296030f30f3251ac673c53d9 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Thu, 29 Aug 2019 23:22:18 +0200
Subject: [PATCH] Fix absolute paths in mail stack

---
 msmtp/.msmtprc                          |  4 ++--
 neomutt/.config/neomutt/personal.muttrc |  4 ++--
 neomutt/.local/bin/MIMEmbellish         |  2 +-
 vim/.vim/filetype.vim                   |  4 ++++
 vim/.vimrc                              | 17 ++++++-----------
 5 files changed, 15 insertions(+), 16 deletions(-)
 create mode 100644 vim/.vim/filetype.vim

diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
index ee733f1..c0c9a06 100644
--- a/msmtp/.msmtprc
+++ b/msmtp/.msmtprc
@@ -2,8 +2,8 @@
 defaults
 auth           on
 tls            on
-tls_trust_file /usr/local/share/certs/ca-root-nss.crt
-logfile        ~/.msmtp.log
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+logfile        /tmp/msmtp.log
 # Accounts
 account gmail
 host smtp.gmail.com
diff --git a/neomutt/.config/neomutt/personal.muttrc b/neomutt/.config/neomutt/personal.muttrc
index 93643aa..d9fd52c 100644
--- a/neomutt/.config/neomutt/personal.muttrc
+++ b/neomutt/.config/neomutt/personal.muttrc
@@ -1,4 +1,4 @@
-macro index,pager i1 '<sync-mailbox><enter-command>source "/home/coolneng/.config/neomutt"/accounts/gmail.muttrc<enter><change-folder>!<enter>'
+macro index,pager i2 '<sync-mailbox><enter-command>source "/home/coolneng/.config/neomutt"/accounts/gmail.muttrc<enter><change-folder>!<enter>'
 source /home/coolneng/.config/neomutt/accounts/gmail.muttrc
-macro index,pager i2 '<sync-mailbox><enter-command>source "/home/coolneng/.config/neomutt"/accounts/uni.muttrc<enter><change-folder>!<enter>'
+macro index,pager i1 '<sync-mailbox><enter-command>source "/home/coolneng/.config/neomutt"/accounts/uni.muttrc<enter><change-folder>!<enter>'
 source /home/coolneng/.config/neomutt/accounts/uni.muttrc
diff --git a/neomutt/.local/bin/MIMEmbellish b/neomutt/.local/bin/MIMEmbellish
index 035cc08..b3b4596 100755
--- a/neomutt/.local/bin/MIMEmbellish
+++ b/neomutt/.local/bin/MIMEmbellish
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python3.6
+#!/bin/python3
 
 import re
 import sys
diff --git a/vim/.vim/filetype.vim b/vim/.vim/filetype.vim
new file mode 100644
index 0000000..47a0dec
--- /dev/null
+++ b/vim/.vim/filetype.vim
@@ -0,0 +1,4 @@
+augroup filetypedetect
+  " Mail
+  autocmd BufRead,BufNewFile *neomutt-*              setfiletype markdown
+augroup END
diff --git a/vim/.vimrc b/vim/.vimrc
index a0f2164..73ec4c9 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -10,32 +10,27 @@ set nofoldenable
 set expandtab
 set tabstop=2
 set shiftwidth=2
-" Don't litter swp files everywhere
+""Don't litter swp files everywhere
 set backupdir=~/.cache
 set directory=~/.cache
 ""Keybindings
 set pastetoggle=<F2>
 map <Space> :noh<CR>
-"" Mail
-au FileType mail
-    \ if expand('%p') =~ '^/tmp/neomutt-' |
-    \     set ft=markdown            	  |
-    \ endif
-"" Markdown
+""Markdown
 au FileType markdown Goyo
 let g:markdown_fenced_languages = ['cpp', 'python', 'java', 'sql']
 let g:vim_markdown_math=1
-"" Pandoc
+""Pandoc
 autocmd FileType markdown nnoremap <silent> <F3> :<c-u>!pandoc %:p:S -o %:p:r:S.pdf --from markdown --template eisvogel --listings --toc -V lang=es &<cr>
 autocmd FileType markdown nnoremap <silent> <F4> :<c-u>!pandoc %:p:S -o %:p:r:S.pdf --from markdown --template handout &<cr>
 autocmd FileType markdown nnoremap <silent> <F5> :<c-u>!pandoc %:p:S -o %:p:r:S.pdf --from markdown --template assignment &<cr>
 autocmd FileType markdown nnoremap <silent> <F6> :<c-u>!zathura %:p:r:S.pdf &<cr>
 autocmd FileType markdown nnoremap <silent> <F7> :<c-u>!rm %:p:r:S.pdf &<cr>
-"" Snippets
+""Snippets
 let g:UltiSnipsExpandTrigger = '<tab>'
 let g:UltiSnipsJumpForwardTrigger = '<tab>'
 let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
-"" Vim-plug
+""Vim-plug
 call plug#begin('~/.vim/plugged')
 Plug 'plasticboy/vim-markdown', { 'for': 'markdown' }
 Plug 'junegunn/goyo.vim', { 'on': 'Goyo' }
@@ -45,7 +40,7 @@ Plug 'airblade/vim-gitgutter'
 Plug 'tpope/vim-surround'
 Plug 'Raimondi/delimitMate'
 call plug#end()
-"" Quitting whether Goyo is active or not
+""Quitting whether Goyo is active or not
 function! g:Goyo_before()
   let b:quitting = 0
   let b:quitting_bang = 0