From d4f97edc0a3fb7569005e6edca42eca869a40561 Mon Sep 17 00:00:00 2001 From: Tucker Evans Date: Fri, 27 Sep 2019 13:23:22 -0400 Subject: Update vim configs --- .gitmodules | 3 + mbsync/.mbsyncrc | 130 +++++++++++++++++++++++++--------- msmtp/.msmtprc | 15 +++- mutt/.mutt/ohmnii.com | 4 ++ mutt/.mutt/tje.tuckerevans.com | 14 ++++ mutt/.mutt/tucker.tuckerevans.com | 14 ++++ mutt/.muttrc | 16 +++-- vim/.vim/after/ftplugin/mail.vim | 1 + vim/.vim/after/ftplugin/nroff.vim | 1 + vim/.vim/after/ftplugin/tex.vim | 2 + vim/.vim/pack/tje/opt/nerdtree | 2 +- vim/.vim/pack/tje/start/vim-gitgutter | 2 +- vim/.vim/pack/tje/start/vim-go | 2 +- vim/.vim/pack/tje/start/vim-ledger | 2 +- vim/.vim/pack/tje/start/vimtex | 1 + vim/.vimrc | 13 +++- 16 files changed, 173 insertions(+), 49 deletions(-) create mode 100644 mutt/.mutt/tje.tuckerevans.com create mode 100644 mutt/.mutt/tucker.tuckerevans.com create mode 160000 vim/.vim/pack/tje/start/vimtex diff --git a/.gitmodules b/.gitmodules index 7e0fd55..8199e59 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "vim/.vim/pack/tje/start/vim-ledger"] path = vim/.vim/pack/tje/start/vim-ledger url = https://github.com/ledger/vim-ledger.git +[submodule "vim/.vim/pack/tje/start/vimtex"] + path = vim/.vim/pack/tje/start/vimtex + url = git@github.com:lervag/vimtex.git diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc index 2cde563..52b6cd8 100644 --- a/mbsync/.mbsyncrc +++ b/mbsync/.mbsyncrc @@ -48,7 +48,7 @@ Channel gmail-sent ####################################### IMAPAccount ohmnii -Host imap.mail.us-east-1.awsapps.com +Host banshee.mxlogin.com User tucker@ohmnii.com PassCmd "pass show email/ohmnii.com" SSLType IMAPS @@ -66,11 +66,11 @@ Master :ohmnii-remote: Slave :ohmnii-local:inbox Channel ohmnii-sent -Master :ohmnii-remote:"Sent Items" +Master :ohmnii-remote:"Sent" Slave :ohmnii-local:sent #Channel ohmnii-trash -#Master :ohmnii-remote:"Deleted Items" +#Master :ohmnii-remote:"Trash" #Slave :ohmnii-local:trash #Channel ohmnii-archive @@ -177,52 +177,114 @@ Group clarkson Channel clarkson-default Channel clarkson-sent -################### -# tuckerevans.com # -################### +####################### +# tje tuckerevans.com # +####################### -IMAPAccount tuckerevans +IMAPAccount tje-tuckerevans Host banshee.mxlogin.com User tje@tuckerevans.com -PassCmd "pass show email/tuckerevans.com" +PassCmd "pass show email/tje.tuckerevans.com" SSLType IMAPS Port 993 CertificateFile /etc/ssl/certs/ca-certificates.crt -IMAPStore tuckerevans-remote -Account tuckerevans +IMAPStore tje-tuckerevans-remote +Account tje-tuckerevans + +MaildirStore tje-tuckerevans-local +Path ~/Mail/tuckerevans/tje/ +Inbox ~/Mail/tuckerevans/tje/inbox + +Channel tje-tuckerevans-default +Master :tje-tuckerevans-remote: +Slave :tje-tuckerevans-local:inbox + +Channel tje-tuckerevans-sent +Master :tje-tuckerevans-remote:"Sent" +Slave :tje-tuckerevans-local:sent + +Channel tje-tuckerevans-notes +Master :tje-tuckerevans-remote:"Notes" +Slave :tje-tuckerevans-local:notes + +#Channel tje-tuckerevans-trash +#Master :tje-tuckerevans-remote:"Trash" +#Slave :tje-tuckerevans-local:trash + +#Channel tje-tuckerevans-archive +#Master :tje-tuckerevans-remote:"Archives" +#Slave :tje-tuckerevans-local:all + +#Channel tje-tuckerevans-junk +#Master :tje-tuckerevans-remote:"spam" +#Slave :tje-tuckerevans-local:junk + +Create Both +Expunge Both +SyncState * + +Group tje-tuckerevans +Channel tje-tuckerevans-default +#Channel tje-tuckerevans-trash +#Channel tje-tuckerevans-archive +Channel tje-tuckerevans-sent +Channel tje-tuckerevans-notes +#Channel tje-tuckerevans-junk + + + +########################## +# tucker tuckerevans.com # +########################## + +IMAPAccount tucker-tuckerevans +Host banshee.mxlogin.com +User tucker@tuckerevans.com +PassCmd "pass show email/tucker.tuckerevans.com" +SSLType IMAPS +Port 993 +CertificateFile /etc/ssl/certs/ca-certificates.crt + +IMAPStore tucker-tuckerevans-remote +Account tucker-tuckerevans + +MaildirStore tucker-tuckerevans-local +Path ~/Mail/tuckerevans/tucker/ +Inbox ~/Mail/tuckerevans/tucker/inbox -MaildirStore tuckerevans-local -Path ~/Mail/tuckerevans/ -Inbox ~/Mail/tuckerevans/inbox +Channel tucker-tuckerevans-default +Master :tucker-tuckerevans-remote: +Slave :tucker-tuckerevans-local:inbox -Channel tuckerevans-default -Master :tuckerevans-remote: -Slave :tuckerevans-local:inbox +Channel tucker-tuckerevans-sent +Master :tucker-tuckerevans-remote:"Sent" +Slave :tucker-tuckerevans-local:sent -Channel tuckerevans-sent -Master :tuckerevans-remote:"Sent" -Slave :tuckerevans-local:sent +#Channel tucker-tuckerevans-notes +#Master :tucker-tuckerevans-remote:"Notes" +#Slave :tucker-tuckerevans-local:notes -#Channel tuckerevans-trash -#Master :tuckerevans-remote:"Trash" -#Slave :tuckerevans-local:trash +#Channel tucker-tuckerevans-trash +#Master :tucker-tuckerevans-remote:"Trash" +#Slave :tucker-tuckerevans-local:trash -#Channel tuckerevans-archive -#Master :tuckerevans-remote:"Archives" -#Slave :tuckerevans-local:all +#Channel tucker-tuckerevans-archive +#Master :tucker-tuckerevans-remote:"Archives" +#Slave :tucker-tuckerevans-local:all -#Channel tuckerevans-junk -#Master :tuckerevans-remote:"spam" -#Slave :tuckerevans-local:junk +#Channel tucker-tuckerevans-junk +#Master :tucker-tuckerevans-remote:"spam" +#Slave :tucker-tuckerevans-local:junk Create Both Expunge Both SyncState * -Group tuckerevans -Channel tuckerevans-default -#Channel tuckerevans-trash -#Channel tuckerevans-archive -Channel tuckerevans-sent -#Channel tuckerevans-junk +Group tucker-tuckerevans +Channel tucker-tuckerevans-default +#Channel tucker-tuckerevans-trash +#Channel tucker-tuckerevans-archive +Channel tucker-tuckerevans-sent +Channel tucker-tuckerevans-notes +#Channel tucker-tuckerevans-junk diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc index 6813c12..327a02c 100644 --- a/msmtp/.msmtprc +++ b/msmtp/.msmtprc @@ -14,7 +14,7 @@ user "tuckerevans24" passwordeval "pass show google_app_passwords/msmtp" account ohmnii -host smtp.mail.us-east-1.awsapps.com +host banshee.mxlogin.com from "tucker@ohmnii.com" port 465 tls on @@ -43,11 +43,20 @@ tls_starttls on user "evanst@clarkson.edu" passwordeval "pass show clarkson/app-passwords/msmtp" -account tuckerevans +account tje-tuckerevans host banshee.mxlogin.com from "tje@tuckerevans.com" port 465 tls on tls_starttls off user "tje@tuckerevans.com" -passwordeval "pass show email/tuckerevans.com" +passwordeval "pass show email/tje.tuckerevans.com" + +account tucker-tuckerevans +host banshee.mxlogin.com +from "tucker@tuckerevans.com" +port 465 +tls on +tls_starttls off +user "tucker@tuckerevans.com" +passwordeval "pass show email/tucker.tuckerevans.com" diff --git a/mutt/.mutt/ohmnii.com b/mutt/.mutt/ohmnii.com index 0f410c6..26048cf 100644 --- a/mutt/.mutt/ohmnii.com +++ b/mutt/.mutt/ohmnii.com @@ -9,3 +9,7 @@ set spoolfile="~/Mail/ohmnii/inbox" set sendmail="/usr/bin/msmtp -a ohmnii" color status black green + +set alias_file= ~/.mutt/alias.ohmnii.com +source $alias_file + diff --git a/mutt/.mutt/tje.tuckerevans.com b/mutt/.mutt/tje.tuckerevans.com new file mode 100644 index 0000000..c8c9931 --- /dev/null +++ b/mutt/.mutt/tje.tuckerevans.com @@ -0,0 +1,14 @@ +set from="Tucker Evans " +set hostname="tuckerevans.com" +set folder="~/Mail/tuckerevans/tje" +set mbox="~/Mail/tuckerevans/tje" +set record="~/Mail/tuckerevans/tje/sent" +set postponed="~/Mail/tuckerevans/tje/drafts" +set spoolfile="~/Mail/tuckerevans/tje/inbox" + +set sendmail="/usr/bin/msmtp -a tje-tuckerevans" + +color status black cyan + +set alias_file = ~/.mutt/alias.tuckerevans.com +source $alias_file diff --git a/mutt/.mutt/tucker.tuckerevans.com b/mutt/.mutt/tucker.tuckerevans.com new file mode 100644 index 0000000..5c4dc1e --- /dev/null +++ b/mutt/.mutt/tucker.tuckerevans.com @@ -0,0 +1,14 @@ +set from="Tucker Evans " +set hostname="tuckerevans.com" +set folder="~/Mail/tuckerevans/tucker" +set mbox="~/Mail/tuckerevans/tucker" +set record="~/Mail/tuckerevans/tucker/sent" +set postponed="~/Mail/tuckerevans/tucker/drafts" +set spoolfile="~/Mail/tuckerevans/tucker/inbox" + +set sendmail="/usr/bin/msmtp -a tucker-tuckerevans" + +color status black magenta + +set alias_file = ~/.mutt/alias.tuckerevans.com +source $alias_file diff --git a/mutt/.muttrc b/mutt/.muttrc index 6e48c0f..2765e81 100644 --- a/mutt/.muttrc +++ b/mutt/.muttrc @@ -47,15 +47,17 @@ alternative_order text/plain text/enriched text/html folder-hook '~/Mail/gmail.com' 'source ~/.mutt/gmail.com' folder-hook '~/Mail/ohmnii.com/inbox' 'source ~/mutt/ohmnii.com' folder-hook '~/Mail/landmark.edu' 'source ~/mutt/landmark.edu' -folder-hook '~/Mail/clarkson.edu' 'source ~/mutt/clarkson.edu -folder-hook '~/Mail/tuckerevans.com/inbox' 'source ~/mutt/tuckerevans.com' +folder-hook '~/Mail/clarkson.edu' 'source ~/mutt/clarkson.edu' +folder-hook '~/Mail/tuckerevans.com/tje/inbox' 'source ~/mutt/tje.tuckerevans.com' +folder-hook '~/Mail/tuckerevans.com/tucker/inbox' 'source ~/mutt/tucker.tuckerevans.com' macro index '~/Mail/gmail/inboxsource ~/.mutt/gmail.com' macro index '~/Mail/ohmnii/inboxsource ~/.mutt/ohmnii.com' -macro index '~/Mail/tuckerevans/inboxsource ~/.mutt/tuckerevans.com' -macro index '~/Mail/clarkson/inboxsource ~/.mutt/clarkson.edu' -macro index '~/Mail/landmark/inboxsource ~/.mutt/landmark.edu' +macro index '~/Mail/tuckerevans/tje/inboxsource ~/.mutt/tje.tuckerevans.com' +macro index '~/Mail/tuckerevans/tucker/inboxsource ~/.mutt/tucker.tuckerevans.com' +macro index '~/Mail/clarkson/inboxsource ~/.mutt/clarkson.edu' +macro index '~/Mail/landmark/inboxsource ~/.mutt/landmark.edu' # -*-muttrc-*- @@ -80,6 +82,7 @@ color index brightwhite black "~N|~O" color body brightwhite black '\*+[^*]+\*+' color body brightwhite black '_+[^_]+_+' +set include #default mailbox source ~/.mutt/gmail.com @@ -89,5 +92,8 @@ bind pager k previous-line bind pager gg top bind pager G bottom +bind index N search-opposite +bind pager N search-opposite + bind browser gg first-entry bind browser G last-entry diff --git a/vim/.vim/after/ftplugin/mail.vim b/vim/.vim/after/ftplugin/mail.vim index c6e2b8a..b4ff4d0 100644 --- a/vim/.vim/after/ftplugin/mail.vim +++ b/vim/.vim/after/ftplugin/mail.vim @@ -1,3 +1,4 @@ set softtabstop=4 set shiftwidth=4 set expandtab +set tw=70 diff --git a/vim/.vim/after/ftplugin/nroff.vim b/vim/.vim/after/ftplugin/nroff.vim index 87f4512..7dcafeb 100644 --- a/vim/.vim/after/ftplugin/nroff.vim +++ b/vim/.vim/after/ftplugin/nroff.vim @@ -1 +1,2 @@ set spell +set tw=70 diff --git a/vim/.vim/after/ftplugin/tex.vim b/vim/.vim/after/ftplugin/tex.vim index 87f4512..c3bea98 100644 --- a/vim/.vim/after/ftplugin/tex.vim +++ b/vim/.vim/after/ftplugin/tex.vim @@ -1 +1,3 @@ set spell +set tw=70 +VimtexTocOpen diff --git a/vim/.vim/pack/tje/opt/nerdtree b/vim/.vim/pack/tje/opt/nerdtree index 72c3656..496b61e 160000 --- a/vim/.vim/pack/tje/opt/nerdtree +++ b/vim/.vim/pack/tje/opt/nerdtree @@ -1 +1 @@ -Subproject commit 72c3656799289d4635520c28e17f737066ce19d6 +Subproject commit 496b61ead1acd80128164cce5c2ff8e89c42ded2 diff --git a/vim/.vim/pack/tje/start/vim-gitgutter b/vim/.vim/pack/tje/start/vim-gitgutter index 1d422b9..44bb472 160000 --- a/vim/.vim/pack/tje/start/vim-gitgutter +++ b/vim/.vim/pack/tje/start/vim-gitgutter @@ -1 +1 @@ -Subproject commit 1d422b9f98194e38bc56e54192c9bc66d95c21f1 +Subproject commit 44bb472bac2fa96c1444fcc02ad981152e56735b diff --git a/vim/.vim/pack/tje/start/vim-go b/vim/.vim/pack/tje/start/vim-go index c9d30da..a7b5edc 160000 --- a/vim/.vim/pack/tje/start/vim-go +++ b/vim/.vim/pack/tje/start/vim-go @@ -1 +1 @@ -Subproject commit c9d30dab225258c3cbe4b42a947dcf9b5edec18b +Subproject commit a7b5edc1872b76e6c0cc18b89fcda3aa98422961 diff --git a/vim/.vim/pack/tje/start/vim-ledger b/vim/.vim/pack/tje/start/vim-ledger index 6eb3bb2..3d76cee 160000 --- a/vim/.vim/pack/tje/start/vim-ledger +++ b/vim/.vim/pack/tje/start/vim-ledger @@ -1 +1 @@ -Subproject commit 6eb3bb21aa979cc295d0480b2179938c12b33d0d +Subproject commit 3d76cee270b1a9583d535737ac2e63166335d45c diff --git a/vim/.vim/pack/tje/start/vimtex b/vim/.vim/pack/tje/start/vimtex new file mode 160000 index 0000000..1ce7a8d --- /dev/null +++ b/vim/.vim/pack/tje/start/vimtex @@ -0,0 +1 @@ +Subproject commit 1ce7a8d560917214de110817768b4feb27c6f524 diff --git a/vim/.vimrc b/vim/.vimrc index 5bba263..ee971b6 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -2,16 +2,20 @@ syntax enable set tabstop=8 set cursorline -set lazyredraw +"set lazyredraw set incsearch set hlsearch set autoindent set scrolloff=3 set spelllang=en set spell -set tw=70 +set tw=80 set ruler +set foldmethod=marker + +set colorcolumn=70 + set encoding=utf-8 @@ -21,7 +25,10 @@ set listchars=eol:\ ,tab:\|\ ,trail:~,extends:>,precedes:<,space:ยท map K i map W :WordCount -colorscheme default +"colorscheme elflord +"set t_Co=256 +set background=light +colorscheme firewatch au BufRead,BufNewFile *.go set filetype=go au BufRead,BufNewFile *.ldg set filetype=ledger -- cgit v1.1