|
|
@@ -19,15 +19,16 @@ Plug 'tpope/vim-fugitive'
|
|
|
Plug 'tpope/vim-commentary'
|
|
|
Plug 'itchyny/lightline.vim'
|
|
|
Plug 'dikiaap/minimalist'
|
|
|
-Plug 'morhetz/gruvbox'
|
|
|
+Plug 'kaicataldo/material.vim'
|
|
|
Plug 'dense-analysis/ale'
|
|
|
Plug 'maximbaz/lightline-ale'
|
|
|
Plug 'preservim/tagbar'
|
|
|
Plug 'vim-php/tagbar-phpctags.vim'
|
|
|
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
|
|
|
Plug 'junegunn/fzf.vim'
|
|
|
-Plug 'arcticicestudio/nord-vim'
|
|
|
Plug 'airblade/vim-gitgutter'
|
|
|
+Plug 'mxw/vim-jsx'
|
|
|
+Plug 'pangloss/vim-javascript'
|
|
|
call plug#end()
|
|
|
|
|
|
filetype plugin indent on
|
|
|
@@ -57,17 +58,20 @@ set showmatch
|
|
|
set smartindent
|
|
|
set smarttab
|
|
|
set splitright
|
|
|
+set termguicolors
|
|
|
set tabstop=2
|
|
|
set whichwrap+=<,>,[,],h,l
|
|
|
set undofile
|
|
|
set undodir=~/.vim/undo
|
|
|
|
|
|
+" ALE
|
|
|
+let g:ale_use_global_executables = 1
|
|
|
+let g:ale_linters_explicit = 1
|
|
|
+let g:ale_linters = {}
|
|
|
+let g:ale_linters.javascript = [ 'eslint', 'tsserver' ]
|
|
|
|
|
|
-" Gruvbox
|
|
|
-let g:gruvbox_italic = 1
|
|
|
-let g:gruvbox_bold = 1
|
|
|
-let g:gruvbox_transaprent_bg = 1
|
|
|
-colorscheme gruvbox
|
|
|
+let g:ale_fixers = {}
|
|
|
+let g:ale_fixers.javascript = [ 'prettier', 'eslint' ]
|
|
|
|
|
|
" ALE completion
|
|
|
let g:ale_completion_autoimport = 1
|
|
|
@@ -82,12 +86,15 @@ nnoremap <C-a>f :ALEFindReferences<CR>
|
|
|
" ALE navigation
|
|
|
nmap <silent> <C-k> <Plug>(ale_previous_wrap)
|
|
|
nmap <silent> <C-j> <Plug>(ale_next_wrap)
|
|
|
+let g:material_theme_style = 'darker'
|
|
|
+let g:material_terminal_italics = 1
|
|
|
+colorscheme material
|
|
|
|
|
|
" Lightline
|
|
|
set laststatus=2
|
|
|
set noshowmode
|
|
|
let g:lightline = {
|
|
|
- \ 'colorscheme': 'gruvbox',
|
|
|
+ \ 'colorscheme': 'material_vim',
|
|
|
\ 'active': {
|
|
|
\ 'left': [
|
|
|
\ [ 'mode', 'paste' ],
|
|
|
@@ -127,9 +134,6 @@ function! FileOffset()
|
|
|
endfunction
|
|
|
|
|
|
" NERDtree
|
|
|
-" Start NERDTree if no file was specified
|
|
|
-autocmd StdinReadPre * let s:std_in=1
|
|
|
-" autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | call NERDTreeToggleCustom() | endif
|
|
|
" Close NERDTree on opening file
|
|
|
let NERDTreeQuitOnOpen=1
|
|
|
" Show hidden files
|
|
|
@@ -252,5 +256,8 @@ endfunction
|
|
|
command! PrettyXml call PrettyXML()
|
|
|
command! PrettyJson call PrettyJSON()
|
|
|
|
|
|
-nmap <Space>j call PrettyXml()
|
|
|
-nmap <Space>x call PrettyJSON()
|
|
|
+nmap <Space>x :call PrettyXML()<CR>
|
|
|
+nmap <Space>j :call PrettyJSON()<CR>
|
|
|
+
|
|
|
+" Disable bad default keybindings
|
|
|
+inoremap <C-w> <Nop>
|
Viktor Grahn