From 81990d68c50ec9064bd8c7af39b6d8d8e0f636c1 Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Mon, 13 Nov 2023 10:31:26 -0500
Subject: [PATCH] Too many vimrc changes

---
 vimrc | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/vimrc b/vimrc
index b38d230..29a640d 100644
--- a/vimrc
+++ b/vimrc
@@ -29,7 +29,7 @@ set statusline+=%#warningmsg#
 set statusline+=%*
 set tabstop=4
 set updatetime=100
-set textwidth=67
+set textwidth=1000
 
 if has("persistent_undo")
   set undodir=~/.vim/_undo//
@@ -46,9 +46,13 @@ au BufRead,BufNewFile .envrc setfiletype sh
 au BufRead,BufNewFile Dockerfile* setfiletype dockerfile
 au BufRead,BufNewFile Pipfile setfiletype toml
 au BufRead,BufNewFile kubectl-edit-status-* setfiletype yaml
+au BufRead,BufNewFile .lintr setfiletype yaml
+au BufRead,BufNewFile devcontainer.json setfiletype jsonc
+au BufRead,BufNewFile devcontainer-feature.json setfiletype jsonc
 au BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
-au FileType go nmap <leader>r  <Plug>(go-run)
+au FileType go nmap <leader>r <Plug>(go-run)
 au FileType go nmap <Leader>c <Plug>(go-coverage-toggle)
+au FileType sh set expandtab
 au QuickFixCmdPost *grep* cwindow
 
 " run :GoBuild or :GoTestCompile based on the go file
@@ -73,7 +77,10 @@ map <leader>l :Minimap<CR>
 map <leader>L :MinimapClose<CR>
 nmap <F8> :TagbarToggle<CR>
 
-au FileType python nmap <leader>t :Black<CR>:w<CR>
+augroup black_on_save
+  autocmd!
+  autocmd BufWritePre *.py Black
+augroup end
 
 let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*']
 let g:airline_powerline_fonts = 1
@@ -108,8 +115,8 @@ let g:vim_markdown_folding_disabled = 1
 let g:vim_markdown_frontmatter = 1
 let g:yapf_style = "pep8"
 
-packadd! dracula
-colorscheme dracula
+packadd! dichromatic
+colorscheme dichromatic
 
 hi Comment cterm=NONE ctermfg=DarkRed gui=NONE guifg=red2
 hi minimapCursor ctermbg=59 ctermfg=228 guibg=#5F5F5F guifg=#FFFF87