From: Mart Lubbers Date: Fri, 12 Jan 2018 09:42:23 +0000 (+0100) Subject: Merge branch 'master' of github.com:dopefishh/dotfiles X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=29f4acd0ae2d23db79e33cc0d4d064b53771d1f6;hp=6dec7d72d5bbffd4459bc9e567cbdedb0672fc6b;p=dotfiles.git Merge branch 'master' of github.com:dopefishh/dotfiles --- diff --git a/email/.config/msmtp/config b/email/.config/msmtp/config index ebde36d..835767d 100644 --- a/email/.config/msmtp/config +++ b/email/.config/msmtp/config @@ -11,11 +11,13 @@ passwordeval pass mail/mart@martlubbers.net from mart@martlubbers.net account ru -host smtp-auth.ru.nl +host smtp.science.ru.nl port 587 auth on tls on -tls_fingerprint 51:BF:85:89:55:26:F6:73:4D:77:C7:0E:FA:B1:8E:A0:8C:64:BB:8D:21:B9:11:D6:3B:E1:AA:44:8C:DF:93:E0 -user s4109503 -passwordeval pass mail/mart.lubbers@student.ru.nl -from mart.lubbers@student.ru.nl +tls_fingerprint 1F:1D:F5:62:FC:9B:D4:BE:77:30:B1:F4:DB:24:49:F8:21:DD:6F:FC:08:1E:4A:78:0B:AC:C4:B4:FA:8E:A4:10 +user mlubbers +passwordeval pass science.ru.nl/mlubbers +from m.lubbers@cs.ru.nl +proxy_host localhost +proxy_port 8008 diff --git a/email/.mutt/mailcap b/email/.mutt/mailcap index 8f502d4..e8892f5 100644 --- a/email/.mutt/mailcap +++ b/email/.mutt/mailcap @@ -1,5 +1,5 @@ # Fork off a process -application/pdf; gv %s; +application/pdf; evince %s; text/html; firefox -new-tab %s & sleep 5; # Open document formats diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc index 701f965..44ab8af 100644 --- a/email/.mutt/muttrc +++ b/email/.mutt/muttrc @@ -16,7 +16,8 @@ set send_charset="us-ascii:utf-8" macro index,pager $ "offlineimap &" "Force refresh" macro attach B "firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"" send2-hook "~f mart@martlubbers.net" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\"" -send2-hook "~f mart.lubbers@student.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\"" +send2-hook "~f m.lubbers@cs.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\"" +send2-hook "~f m.lubbers@science.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\"" #folder-hook . push "~=$" diff --git a/vim/.vim/after/ftplugin/clean.vim b/vim/.vim/after/ftplugin/clean.vim new file mode 100644 index 0000000..0f43883 --- /dev/null +++ b/vim/.vim/after/ftplugin/clean.vim @@ -0,0 +1,2 @@ +setlocal tags+=/opt/clean/lib/tags +set statusline+=%{cleanvim#tags#statusline()} diff --git a/vim/.vim/after/ftplugin/tex.vim b/vim/.vim/after/ftplugin/tex.vim new file mode 100644 index 0000000..978ea51 --- /dev/null +++ b/vim/.vim/after/ftplugin/tex.vim @@ -0,0 +1,9 @@ +setlocal wrap +setlocal tw=0 +setlocal colorcolumn=0 + +" Vimtex options +let g:vimtex_compiler_enabled = 0 +let g:vimtex_toc_enabled = 1 +let g:vimtex_toc_help = 0 +let g:vimtex_toc_refresh_always = 1 diff --git a/vim/.vim/ftplugin/plaintex.vim b/vim/.vim/ftplugin/plaintex.vim new file mode 100644 index 0000000..2aa1973 --- /dev/null +++ b/vim/.vim/ftplugin/plaintex.vim @@ -0,0 +1 @@ +set ft=tex diff --git a/vim/.vim/ftplugin/tex.vim b/vim/.vim/ftplugin/tex.vim deleted file mode 100644 index e4b82c2..0000000 --- a/vim/.vim/ftplugin/tex.vim +++ /dev/null @@ -1,3 +0,0 @@ -setlocal wrap -setlocal tw=0 -setlocal colorcolumn=0 diff --git a/vim/.vim/pack/plugins/start/syntastic b/vim/.vim/pack/plugins/start/syntastic index 4b93dff..96cc251 160000 --- a/vim/.vim/pack/plugins/start/syntastic +++ b/vim/.vim/pack/plugins/start/syntastic @@ -1 +1 @@ -Subproject commit 4b93dffbd98fd3885ee7c4fcedaa65cf5b72f56d +Subproject commit 96cc251075f3f9d290c5afd4adf1b64c1542d469 diff --git a/vim/.vim/pack/plugins/start/vim-clean b/vim/.vim/pack/plugins/start/vim-clean index e03f6f5..ab14122 160000 --- a/vim/.vim/pack/plugins/start/vim-clean +++ b/vim/.vim/pack/plugins/start/vim-clean @@ -1 +1 @@ -Subproject commit e03f6f57d05b5708fde8a9b42ba90b1628034950 +Subproject commit ab141221b34dd3b9026ab7061b7d8d1dcfd8df64 diff --git a/vim/.vim/pack/plugins/start/vim-gnupg b/vim/.vim/pack/plugins/start/vim-gnupg index b54fd4c..5b06978 160000 --- a/vim/.vim/pack/plugins/start/vim-gnupg +++ b/vim/.vim/pack/plugins/start/vim-gnupg @@ -1 +1 @@ -Subproject commit b54fd4c18a45a27f2b9d9570f33dc2f93508733d +Subproject commit 5b069789e237ca43533a229580822772640ce301 diff --git a/vim/.vim/pack/plugins/start/vimtex b/vim/.vim/pack/plugins/start/vimtex index fe5b4a5..995bbd7 160000 --- a/vim/.vim/pack/plugins/start/vimtex +++ b/vim/.vim/pack/plugins/start/vimtex @@ -1 +1 @@ -Subproject commit fe5b4a5b9606230c9cf843b65de4e94e0e63133a +Subproject commit 995bbd729a6a42e92188859e0013b5476fc5ad01