|
|
@ -10,6 +10,9 @@ if has('nvim') && has('win32')
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
|
|
call plug#begin()
|
|
|
|
call plug#begin()
|
|
|
|
|
|
|
|
if !has('nvim')
|
|
|
|
|
|
|
|
Plug 'dense-analysis/ale' " just for linting this time around
|
|
|
|
|
|
|
|
endif
|
|
|
|
Plug 'tpope/vim-fugitive' " integration with the git cli
|
|
|
|
Plug 'tpope/vim-fugitive' " integration with the git cli
|
|
|
|
Plug 'tpope/vim-surround' " edits surrounding quotes and parens and the like
|
|
|
|
Plug 'tpope/vim-surround' " edits surrounding quotes and parens and the like
|
|
|
|
Plug 'tpope/vim-rails' " rails project management stuff
|
|
|
|
Plug 'tpope/vim-rails' " rails project management stuff
|
|
|
@ -22,6 +25,7 @@ call plug#begin()
|
|
|
|
Plug 'fatih/vim-hclfmt' " nicely formats hcl files
|
|
|
|
Plug 'fatih/vim-hclfmt' " nicely formats hcl files
|
|
|
|
Plug 'nanotech/jellybeans.vim' " the best colorscheme
|
|
|
|
Plug 'nanotech/jellybeans.vim' " the best colorscheme
|
|
|
|
Plug 'ervandew/supertab' " makes tab better apparently
|
|
|
|
Plug 'ervandew/supertab' " makes tab better apparently
|
|
|
|
|
|
|
|
Plug 'NoahTheDuke/vim-just' " justfiles
|
|
|
|
Plug 'scrooloose/nerdcommenter' " no idea if I'm even using this
|
|
|
|
Plug 'scrooloose/nerdcommenter' " no idea if I'm even using this
|
|
|
|
Plug 'ctrlpvim/ctrlp.vim' " don't actually know how to use this honestly
|
|
|
|
Plug 'ctrlpvim/ctrlp.vim' " don't actually know how to use this honestly
|
|
|
|
Plug 'itchyny/lightline.vim' " fancy status line
|
|
|
|
Plug 'itchyny/lightline.vim' " fancy status line
|
|
|
@ -533,10 +537,16 @@ nmap <S-M> :LspDiagCurrent<CR>
|
|
|
|
|
|
|
|
|
|
|
|
" ALE -----------------------------------------------------------------------{{{
|
|
|
|
" ALE -----------------------------------------------------------------------{{{
|
|
|
|
if !has('nvim')
|
|
|
|
if !has('nvim')
|
|
|
|
let g:ale_linters = {'rust': ['analyzer']}
|
|
|
|
let g:ale_linters = {
|
|
|
|
let g:ale_fixers = {'rust': ['rustfmt', 'trim_whitespace', 'remove_trailing_lines']}
|
|
|
|
\ 'rust': ['analyzer'],
|
|
|
|
let g:ale_rust_cargo_use_clippy = 1
|
|
|
|
\ 'python': ['ruff']
|
|
|
|
let g:ale_completion_enabled = 1
|
|
|
|
\ }
|
|
|
|
|
|
|
|
let g:ale_fixers = {
|
|
|
|
|
|
|
|
\ 'rust': ['rustfmt', 'trim_whitespace', 'remove_trailing_lines'],
|
|
|
|
|
|
|
|
\ 'python': ['ruff_format', 'reorder-python-imports']
|
|
|
|
|
|
|
|
\ }
|
|
|
|
|
|
|
|
" we're not using ALE for Autocomplete because we're using lsp instead
|
|
|
|
|
|
|
|
let g:ale_completion_enabled = 0
|
|
|
|
set completeopt=menu,menuone,preview,noselect,noinsert
|
|
|
|
set completeopt=menu,menuone,preview,noselect,noinsert
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
" ---------------------------------------------------------------------------}}}
|
|
|
|
" ---------------------------------------------------------------------------}}}
|
|
|
|