Browse Source

Update TypeScript support; go 'isotope'.

my_name 2 months ago
parent
commit
e4241d8d55
2 changed files with 21 additions and 10 deletions
  1. 19
    8
      home/.config/nvim/init.vim
  2. 2
    2
      home/.vimrc_background

+ 19
- 8
home/.config/nvim/init.vim View File

@@ -116,6 +116,7 @@ Plug 'ludovicchabant/vim-gutentags'
116 116
 Plug 'airblade/vim-rooter'
117 117
 Plug 'mhinz/vim-startify'
118 118
 Plug 'sheerun/vim-polyglot'
119
+Plug 'leafgarland/typescript-vim'
119 120
 Plug 'joonty/vdebug'
120 121
 Plug 'sirver/ultisnips'
121 122
       \ |  Plug 'honza/vim-snippets'
@@ -148,7 +149,6 @@ Plug 'ncm2/ncm2'
148 149
       \ | Plug 'autozimu/LanguageClient-neovim', { 'branch': 'next', 'do': 'bash install.sh' }
149 150
       \ | Plug 'bfrg/vim-cpp-modern', { 'for': 'c++,c' }
150 151
       \ | Plug 'ekalinin/dockerfile.vim'
151
-      \ | Plug 'ap/vim-css-color'
152 152
 
153 153
 call plug#end()
154 154
 " }}}
@@ -250,29 +250,40 @@ endif
250 250
 "
251 251
 let g:autoformat_remove_trailing_spaces = 1
252 252
 " {{{2 ale
253
-let g:ale_command_wrapper = 'nice -n5'
254
-let g:ale_set_ballons = 1
253
+let g:ale_command_wrapper = 'nice -n8'
254
+let g:ale_set_ballons = 0
255 255
 let g:ale_rust_cargo_use_clippy = executable('cargo-clippy')
256 256
 let g:ale_rust_cargo_check_tests = 1
257 257
 let g:ale_virtualtext_cursor = 1
258 258
 let g:ale_completion_enabled = 0
259 259
 let g:ale_use_global_executables = 0
260
-let g:ale_fix_on_save = 1
260
+let g:ale_fix_on_save = 0
261
+let g:ale_fixers_ignore = {
262
+      \ 'typescript': ['tslint']
263
+      \ }
261 264
 let g:ale_fixers = {
262 265
       \ '*' : ['remove_trailing_lines', 'trim_whitespace'],
263
-      \ 'javascript': ['eslint'],
264
-      \ 'typescript': ['eslint'],
265
-      \ 'vue': ['eslint'],
266
-      \ 'scss': ['stylelint'],
266
+      \ 'javascript': ['eslint', 'prettier'],
267
+      \ 'typescript': ['eslint', 'prettier'],
268
+      \ 'vue': ['eslint', 'prettier'],
269
+      \ 'scss': ['stylelint', 'prettier'],
267 270
       \ 'html': ['stylelint', 'prettier', 'tidy'],
268 271
       \ 'rust': ['rustfmt'],
269 272
       \ 'elixir': ['mix_format'],
270 273
       \ }
274
+let g:ale_linters_ignore = {
275
+      \ 'typescript': ['tslint']
276
+      \ }
271 277
 let g:ale_linters = {
272 278
       \ 'rust': ['rustc', 'clippy', 'cargo'],
279
+      \ 'typescript': ['eslint', 'prettier'],
280
+      \ 'javascript':  ['eslint', 'prettier']
273 281
       \ }
274 282
 " 2}}}
275 283
 "
284
+let g:polyglot_disabled = ['jsx', 'typescript']
285
+let g:vim_jsx_pretty_template_tags = []
286
+"
276 287
 let g:racer_experimental_completer = 0
277 288
 let g:racer_insert_paren = 1
278 289
 

+ 2
- 2
home/.vimrc_background View File

@@ -1,3 +1,3 @@
1
-if !exists('g:colors_name') || g:colors_name != 'base16-harmonic-dark'
2
-  colorscheme base16-harmonic-dark
1
+if !exists('g:colors_name') || g:colors_name != 'base16-isotope'
2
+  colorscheme base16-isotope
3 3
 endif

Loading…
Cancel
Save