jam/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some busted settings

Browse Source
This commit is contained in:
James Dixon 2020-06-15 00:35:53 -04:00
parent 35b59a10f1
commit 0cebe64923
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vim/vimrc
View File

@ -66,10 +66,15 @@ function! SetPluginSettings()
"ale "ale
if exists(':ALEToggle') if exists(':ALEToggle')
let g:ale_linters = {
\ 'javascript': ['eslint'],
\ 'markdown': ['mdl', 'write-good'],
\}
let g:ale_fixers = { let g:ale_fixers = {
\ '*': ['remove_trailing_lines', 'trim_whitespace'], \ '*': ['remove_trailing_lines', 'trim_whitespace'],
\ 'javascript': ['eslint'], \ 'javascript': ['prettier'],
\} \ 'markdown': ['prettier'],
\}
let g:ale_sign_error = '->' let g:ale_sign_error = '->'
let g:ale_sign_warning = '--' let g:ale_sign_warning = '--'
endif endif
@ -79,6 +84,7 @@ function! SetPluginSettings()
"colorscheme gruvbox "colorscheme gruvbox
"colorscheme jellybeans "colorscheme jellybeans
"colorscheme molokai "colorscheme molokai
colorscheme monokai-phoenix
"colorscheme Benokai "colorscheme Benokai
"colorscheme Monokai "colorscheme Monokai
"colorscheme badwolf "colorscheme badwolf
@ -103,6 +109,7 @@ set number
set wrap set wrap
set showbreak=↪\ set showbreak=↪\
set listchars=tab:→\ ,extends:›,precedes:‹,nbsp:·,trail:·,eol:¬ set listchars=tab:→\ ,extends:›,precedes:‹,nbsp:·,trail:·,eol:¬
set list
set foldmethod=marker set foldmethod=marker
set lazyredraw set lazyredraw
set regexpengine=1 set regexpengine=1
@ -283,15 +290,10 @@ if has("autocmd")
"language/filetype "language/filetype
augroup languages augroup languages
autocmd! autocmd!
"shell
autocmd BufNewFile,BufRead *bash* set syntax=sh autocmd BufNewFile,BufRead *bash* set syntax=sh
"python
autocmd FileType python xnoremap <leader>r <esc>:'<,'>:w !python3<CR> autocmd FileType python xnoremap <leader>r <esc>:'<,'>:w !python3<CR>
"go autocmd FileType go set noexpandtab
autocmd FileType go set expandtab! "go uses real tabs
"html
autocmd FileType html :syntax sync fromstart autocmd FileType html :syntax sync fromstart
"filestypes where tabs should = 2 spaces
autocmd FileType html,javascript,css,json,yaml,sh autocmd FileType html,javascript,css,json,yaml,sh
\ setlocal ts=2 sts=2 sw=2 expandtab \ setlocal ts=2 sts=2 sw=2 expandtab
augroup END augroup END

7
vim/vimrc.min
View File

@ -54,15 +54,10 @@ augroup END
augroup languages augroup languages
autocmd! autocmd!
"shell
autocmd BufNewFile,BufRead *bash* set syntax=sh autocmd BufNewFile,BufRead *bash* set syntax=sh
"python
autocmd FileType python xnoremap <leader>r <esc>:'<,'>:w !python3<CR> autocmd FileType python xnoremap <leader>r <esc>:'<,'>:w !python3<CR>
"go autocmd FileType go set noexpandtab
autocmd FileType go set expandtab! "go uses real tabs
"html
autocmd FileType html :syntax sync fromstart autocmd FileType html :syntax sync fromstart
"filestypes where tabs should = 2 spaces
autocmd FileType html,javascript,css,json,yaml,sh autocmd FileType html,javascript,css,json,yaml,sh
\ setlocal ts=2 sts=2 sw=2 expandtab \ setlocal ts=2 sts=2 sw=2 expandtab
augroup END augroup END