fix: vim polyglot indentation and filtype with asm
This commit is contained in:
parent
37b1e0cdb9
commit
af7694cb81
5 changed files with 20 additions and 8 deletions
11
vim/.vim/after/filetypes.vim
Normal file
11
vim/.vim/after/filetypes.vim
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
augroup MyFtOverride
|
||||||
|
autocmd!
|
||||||
|
autocmd BufRead,BufNewFile *.h setfiletype=c
|
||||||
|
autocmd BufRead,BufNewFile *.hpp setfiletype=cpp
|
||||||
|
autocmd BufRead,BufNewFile *.tpp setfiletype=cpp
|
||||||
|
autocmd BufRead,BufNewFile *.ts setfiletype=typescript
|
||||||
|
autocmd BufRead,BufNewFile *.js setfiletype=javascript
|
||||||
|
autocmd BufRead,BufNewFile *.s setfiletype=asm
|
||||||
|
autocmd BufRead,BufNewFile */i3/config setfiletype=i3config
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
set ts=4 sw=4
|
set ts=8
|
||||||
|
set hls
|
||||||
set wrap!
|
set wrap!
|
||||||
set number
|
set number
|
||||||
set incsearch
|
set incsearch
|
||||||
|
|
@ -6,6 +7,7 @@ set cursorline
|
||||||
set scrolloff=2
|
set scrolloff=2
|
||||||
set completeopt=menuone,noinsert
|
set completeopt=menuone,noinsert
|
||||||
set clipboard=unnamedplus
|
set clipboard=unnamedplus
|
||||||
|
set noexpandtab
|
||||||
|
|
||||||
augroup FocusNumbers
|
augroup FocusNumbers
|
||||||
autocmd!
|
autocmd!
|
||||||
|
|
@ -13,3 +15,8 @@ augroup FocusNumbers
|
||||||
autocmd WinLeave,BufLeave * setlocal norelativenumber
|
autocmd WinLeave,BufLeave * setlocal norelativenumber
|
||||||
augroup END
|
augroup END
|
||||||
|
|
||||||
|
let g:polyglot_disabled = [
|
||||||
|
'r-lang',
|
||||||
|
'tpp',
|
||||||
|
'autoindent'
|
||||||
|
]
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
au BufRead,BufNewFile *.h set filetype=c
|
|
||||||
au BufRead,BufNewFile *.hpp set filetype=cpp
|
|
||||||
au BufRead,BufNewFile *.tpp set filetype=cpp
|
|
||||||
au BufRead,BufNewFile *.ts set filetype=typescript
|
|
||||||
au BufRead,BufNewFile *.js set filetype=javascript
|
|
||||||
au BufRead,BufNewFile **/i3/config set filetype=i3config
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
let g:polyglot_disabled = ['tpp']
|
|
||||||
|
|
||||||
if executable('clangd')
|
if executable('clangd')
|
||||||
au User lsp_setup call lsp#register_server({
|
au User lsp_setup call lsp#register_server({
|
||||||
|
|
|
||||||
|
|
@ -1 +1,2 @@
|
||||||
source ~/.vim/init.vim
|
source ~/.vim/init.vim
|
||||||
|
" set makeprg=make\ -\C\ build
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue