diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index e98b3c4..c4203a9 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -122,11 +122,6 @@ set ruler " Show the line and column numbers of the cursor. set formatoptions+=o " Continue comment marker in new lines. set formatoptions+=j " Delete comment character when joining commented lines set textwidth=78 " Hard-wrap long lines as you type them. -set softtabstop=4 " Finetunes the amount of white space to be added. -set tabstop=4 " Render TABs using this many spaces. -set shiftwidth=4 " Indentation amount for < and > commands. -set smarttab " Indent with tabs, align with spaces. -set expandtab " When on, uses space instead of tabs. set autoindent " Copy indent from current line when starting a new line set noerrorbells " No beeps. set modeline " Enable modeline. @@ -462,23 +457,6 @@ augroup terminal_job au TermOpen * setlocal listchars= nonumber norelativenumber augroup END -augroup indentation_defaults - au! - au BufRead,BufNewFile *.c set noexpandtab - au BufRead,BufNewFile *.h set noexpandtab - au BufRead,BufNewFile Makefile* set noexpandtab - au BufRead,BufNewFile *.vim setlocal noet ts=4 sw=4 sts=4 - au BufRead,BufNewFile *.txt setlocal noet ts=4 sw=4 - au BufRead,BufNewFile *.lua setlocal noet ts=4 sw=4 sts=4 - au BufRead,BufNewFile *.py setlocal ts=4 sts=4 sw=4 tw=80 smarttab et completeopt-=preview - au BufRead,BufNewFile */gst-*/*.[ch] set et sw=2 - au BufRead,BufNewFile */gstreamer-*/*.[ch] set et sw=2 - au BufRead,BufNewFile */pulseaudio/*.[ch] set et sw=4 tw=128 - au BufRead,BufNewFile *.purs set et sw=2 sts=2 si - au FileType fstab,systemd set noexpandtab - au FileType gitconfig,sh,toml set noexpandtab -augroup END - augroup spell_check au! autocmd FileType gitcommit setlocal spell textwidth=72