Merge branch 'main' of git.meatballhat.com:x/dotfiles

This commit is contained in:
2022-04-28 16:24:03 -04:00
6 changed files with 53 additions and 35 deletions

5
vimrc
View File

@@ -37,12 +37,13 @@ if has("persistent_undo")
endif
au BufRead,BufNewFile *.gcfg setfiletype gitconfig
au BufRead,BufNewFile *.hcl setfiletype hcl
au BufRead,BufNewFile *.nomad setfiletype hcl
au BufRead,BufNewFile *.service setfiletype systemd
au BufRead,BufNewFile .Rprofile setfiletype r
au BufRead,BufNewFile .envrc setfiletype sh
au BufRead,BufNewFile Dockerfile* setfiletype dockerfile
au BufRead,BufNewFile Pipfile setfiletype toml
au BufRead,BufNewFile Pipfile setfiletype toml
au BufWritePre *.py execute ':Black'
au BufNewFile,BufRead *.go setlocal noexpandtab tabstop=4 shiftwidth=4
au FileType go nmap <leader>r <Plug>(go-run)
@@ -81,6 +82,8 @@ let g:go_highlight_function_calls = 1
let g:go_highlight_functions = 1
let g:go_highlight_operators = 1
let g:go_info_mode='gopls'
let g:html_indent_script1 = "inc"
let g:html_indent_style1 = "inc"
let g:python_highlight_all = 1
let g:rustfmt_autosave = 1
let g:shfmt_extra_args = '-i 2'