refactor(nvim): migrate options to tabs instead of spaces

This commit is contained in:
Stefan Imhoff
2022-08-24 08:13:46 +02:00
parent 55c30efbaf
commit 24098ae3eb
3 changed files with 6 additions and 16 deletions

View File

@@ -7,18 +7,12 @@ root = true
[*] [*]
charset = utf-8 charset = utf-8
end_of_line = lf end_of_line = lf
indent_size = 2 indent_style = tab
indent_style = space
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
[*.{py,md,rst,sh,c,h}]
indent_size = 4
indent_style = space
[*.{md,markdown,pandoc}] [*.{md,markdown,pandoc}]
trim_trailing_whitespace = false trim_trailing_whitespace = false
[Makefile] [Makefile]
indent_style = tab indent_style = tab

View File

@@ -38,7 +38,6 @@ vim.cmd([[
autocmd! autocmd!
autocmd FileType html,eruby,njk setlocal foldmethod=indent autocmd FileType html,eruby,njk setlocal foldmethod=indent
autocmd FileType html,eruby,njk setlocal omnifunc=htmlcomplete#CompleteTags autocmd FileType html,eruby,njk setlocal omnifunc=htmlcomplete#CompleteTags
autocmd Filetype html,eruby,njk setlocal ts=2 sts=2 sw=2 expandtab
augroup END augroup END
augroup _ft_css augroup _ft_css
@@ -48,21 +47,18 @@ vim.cmd([[
autocmd FileType css setlocal foldmarker={,} autocmd FileType css setlocal foldmarker={,}
autocmd FileType css,scss,sass,less,stylus setlocal omnifunc=csscomplete#CompleteCSS autocmd FileType css,scss,sass,less,stylus setlocal omnifunc=csscomplete#CompleteCSS
autocmd Filetype css,scss,sass,less,stylus setlocal iskeyword+=- autocmd Filetype css,scss,sass,less,stylus setlocal iskeyword+=-
autocmd Filetype css,scss,sass,less,stylus setlocal ts=2 sts=2 sw=2 expandtab
augroup END augroup END
augroup _ft_xml augroup _ft_xml
autocmd! autocmd!
autocmd FileType xml setlocal foldmethod=indent autocmd FileType xml setlocal foldmethod=indent
autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags autocmd FileType xml set omnifunc=xmlcomplete#CompleteTags
autocmd Filetype xml setlocal ts=2 sts=2 sw=2 expandtab
augroup END augroup END
augroup _ft_javascript augroup _ft_javascript
autocmd! autocmd!
autocmd FileType javascript setlocal foldmethod=indent autocmd FileType javascript setlocal foldmethod=indent
autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
autocmd FileType javascript setlocal ts=2 sts=2 sw=2 expandtab
autocmd BufRead,BufNewFile *.es6 setfiletype javascript autocmd BufRead,BufNewFile *.es6 setfiletype javascript
autocmd BufRead,BufNewFile *.jsx setfiletype javascript.jsx autocmd BufRead,BufNewFile *.jsx setfiletype javascript.jsx
augroup END augroup END

View File

@@ -17,9 +17,9 @@ local options = {
grepprg = "rg\\ --vimgrep\\ --no-heading\\ --smart-case", grepprg = "rg\\ --vimgrep\\ --no-heading\\ --smart-case",
hidden = true, hidden = true,
ignorecase = true, ignorecase = true,
list = true, list = false,
listchars = { listchars = {
tab = "\\ ", tab = " ",
trail = "·", trail = "·",
nbsp = ".", nbsp = ".",
extends = "", extends = "",
@@ -32,18 +32,18 @@ local options = {
relativenumber = true, relativenumber = true,
scrolloff = 8, scrolloff = 8,
shiftround = true, shiftround = true,
shiftwidth = 2, shiftwidth = 4,
shortmess = "caoOtI", -- Welcome screen shortmess = "caoOtI", -- Welcome screen
showbreak = "", showbreak = "",
sidescrolloff = 8, sidescrolloff = 8,
signcolumn = "yes:2", signcolumn = "yes:2",
smartcase = true, smartcase = true,
softtabstop = 2, softtabstop = 4,
spelllang = "en_us", spelllang = "en_us",
splitbelow = true, splitbelow = true,
splitright = true, splitright = true,
swapfile = false, swapfile = false,
tabstop = 2, tabstop = 4,
termguicolors = true, termguicolors = true,
timeoutlen = 300, timeoutlen = 300,
title = true, title = true,