Skip to content

Commit 6fa87a2

Browse files
committed
no hamllint, es6 ft
1 parent 22b1b8a commit 6fa87a2

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

common_config/01_plugin_config.vim

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ call dein#begin(expand('~/.vim/dein')) " plugins' root path
1818
call dein#add('tpope/vim-sleuth')
1919
call dein#add('slim-template/vim-slim')
2020
call dein#add('mxw/vim-jsx')
21+
call dein#add('isRuslan/vim-es6')
2122

2223
" Neomake for async static linting
2324
call dein#add('neomake/neomake')
2425
let g:neomake_eruby_rubocop_maker = {'exe': 'rubocop'}
2526
let g:neomake_eruby_enabled_makers = ['rubocop']
2627
let g:neomake_elixir_enabled_makers = ['mix']
2728
let g:neomake_javascript_enabled_makers = ['eslint']
28-
let g:neomake_javascript_eslint_exe = $PWD .'/node_modules/.bin/eslint'
29-
let g:neomake_haml_enabled_makers = ['hamllint']
29+
let g:neomake_haml_enabled_makers = []
3030
autocmd! BufWritePost * Neomake
3131

3232
" NERDTree for project drawer
@@ -60,6 +60,7 @@ call dein#begin(expand('~/.vim/dein')) " plugins' root path
6060
nnoremap <Leader>b :<C-U>Buffers<CR>
6161
nnoremap <Leader>t :<C-U>Files<CR>
6262
nnoremap <Leader>T :<C-U>FZFMru<CR>
63+
nnoremap <Leader>B :<C-U>FZFMru<CR>
6364
6465
" Tagbar for navigation by tags using CTags
6566
call dein#add('majutsushi/tagbar')

common_config/general_config.vim

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ au BufNewFile,BufRead *.haml set indentkeys=o,O,*<Return>,=else,=elsif,=rescue,=
104104
" nghaml is haml
105105
au BufNewFile,BufRead *.nghaml set filetype=haml
106106

107+
" es6 is js
108+
au BufNewFile,BufRead *.js.es6 set filetype=javascript
109+
107110
" Set encoding
108111
set encoding=utf-8
109112

0 commit comments

Comments
 (0)