Reorganize init.vim / nvim.vim

init.vim

@@ -14,9 +14,6 @@ set mouse=
 set completeopt-=preview
 set nofoldenable
 set spellcapcheck=0
-"set sw=2
-"set ts=2
-"set et
 
 set smartcase
 set nohlsearch
@@ -25,7 +22,14 @@ let g:c_syntax_for_h = 1
 
 autocmd FileType c,cpp set cindent
 autocmd FileType c,cpp set cinoptions=:0,l0,t0,g0,(0
+autocmd FileType c setlocal ts=8 sw=8 noet
+autocmd FileType python setlocal ts=4 sw=4 et
+autocmd FileType asciidoctor setlocal wrap lbr iskeyword+=-
 autocmd FileType vue,javascript,typescript set completeopt=menu,menuone,noinsert,fuzzy
+autocmd FileType lua setlocal ts=2 sw=2 et
+
+autocmd BufNewFile,BufRead *.pio setfiletype pioasm
+autocmd BufRead,BufNewFile */templates/*.html set filetype=htmldjango
 
 if has('nvim')
   exec 'source' expand('~/.config/nvim/nvim.vim')

nvim.vim

@@ -12,12 +12,6 @@ end
 highlight ExtraWhitespace ctermbg=darkgreen guibg=darkgreen
 match ExtraWhitespace /\s\+$\| \+\ze\t/
 
-au FileType python setlocal ts=4 sw=4 et
-au FileType c setlocal ts=8 sw=8 noet
-au FileType asciidoctor setlocal wrap lbr iskeyword+=-
-
-au BufRead,BufNewFile */templates/*.html set filetype=htmldjango
-
 autocmd BufNewFile *.h       0r ~/.config/nvim/template/h
 autocmd BufNewFile *.html    0r ~/.config/nvim/template/html5
 autocmd BufNewFile *.mk      0r ~/.config/nvim/template/make
@@ -25,8 +19,6 @@ autocmd BufNewFile Makefile  0r ~/.config/nvim/template/make
 autocmd BufNewFile *.hs      0r ~/.config/nvim/template/hs
 autocmd BufNewFile *.adoc    0r ~/.config/nvim/template/adoc
 
-autocmd BufNewFile,BufRead *.pio setfiletype pioasm
-
 "highlight Pmenu ctermbg=235 guibg=black
 "highlight Pmenu ctermfg=white guifg=white
 "highlight PmenuSel ctermbg=235 guibg=black
@@ -41,5 +33,3 @@ let g:jsx_ext_required = 0
 set viminfo='20,<1000,s100,f1
 
 lua require("init")
-
-" EOF