diff options
44 files changed, 140 insertions, 452 deletions
diff --git a/.config/nvim/after/ftplugin/c.lua b/.config/nvim/after/ftplugin/c.lua new file mode 100644 index 0000000..69b5244 --- /dev/null +++ b/.config/nvim/after/ftplugin/c.lua @@ -0,0 +1,6 @@ +vimrc.after_ftplugin('c', function(conf) + conf.indent(conf.SPACE, 4) + vim.bo.cinoptions = ':0,l1' + vim.g.c_comment_strings = true + vim.g.c_space_errors = true +end) diff --git a/.config/nvim/after/ftplugin/c.vim b/.config/nvim/after/ftplugin/c.vim deleted file mode 100644 index 12de33e..0000000 --- a/.config/nvim/after/ftplugin/c.vim +++ /dev/null @@ -1,20 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_c_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 -FtpluginSetLocal cinoptions=:0,l1 - -let g:c_comment_strings = v:true -let g:c_space_errors = v:true - - - -let b:did_ftplugin_c_after = 1 diff --git a/.config/nvim/after/ftplugin/cmake.lua b/.config/nvim/after/ftplugin/cmake.lua new file mode 100644 index 0000000..ee231d9 --- /dev/null +++ b/.config/nvim/after/ftplugin/cmake.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('cmake', function(conf) + conf.indent(conf.SPACE, 2) +end)
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/cmake.vim b/.config/nvim/after/ftplugin/cmake.vim deleted file mode 100644 index b4f5591..0000000 --- a/.config/nvim/after/ftplugin/cmake.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_cmake_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_cmake_after = 1
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/cpp.lua b/.config/nvim/after/ftplugin/cpp.lua new file mode 100644 index 0000000..5ace4e2 --- /dev/null +++ b/.config/nvim/after/ftplugin/cpp.lua @@ -0,0 +1,6 @@ +vimrc.after_ftplugin('cpp', function(conf) + conf.indent(conf.SPACE, 4) + vim.bo.cinoptions = ':0,l1,g0,N-s' + vim.g.c_comment_strings = true + vim.g.c_space_errors = true +end)
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/cpp.vim b/.config/nvim/after/ftplugin/cpp.vim deleted file mode 100644 index 13c0374..0000000 --- a/.config/nvim/after/ftplugin/cpp.vim +++ /dev/null @@ -1,20 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_cpp_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 -FtpluginSetLocal cinoptions=:0,l1,g0,N-s - -let g:c_comment_strings = v:true -let g:c_space_errors = v:true - - - -let b:did_ftplugin_cpp_after = 1
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/css.lua b/.config/nvim/after/ftplugin/css.lua new file mode 100644 index 0000000..9fad7cb --- /dev/null +++ b/.config/nvim/after/ftplugin/css.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('css', function(conf) + conf.indent(conf.SPACE, 2) +end) diff --git a/.config/nvim/after/ftplugin/css.vim b/.config/nvim/after/ftplugin/css.vim deleted file mode 100644 index e4743e8..0000000 --- a/.config/nvim/after/ftplugin/css.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_css_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_css_after = 1 diff --git a/.config/nvim/after/ftplugin/gitcommit.lua b/.config/nvim/after/ftplugin/gitcommit.lua new file mode 100644 index 0000000..774138a --- /dev/null +++ b/.config/nvim/after/ftplugin/gitcommit.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('gitcommit', function(conf) + vim.wo.spell = true +end) diff --git a/.config/nvim/after/ftplugin/gitcommit.vim b/.config/nvim/after/ftplugin/gitcommit.vim deleted file mode 100644 index 915a193..0000000 --- a/.config/nvim/after/ftplugin/gitcommit.vim +++ /dev/null @@ -1,14 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_gitcommit_after') - finish -endif - - - -FtpluginSetLocal spell - - - -let b:did_ftplugin_gitcommit_after = 1 diff --git a/.config/nvim/after/ftplugin/go.lua b/.config/nvim/after/ftplugin/go.lua new file mode 100644 index 0000000..30139b1 --- /dev/null +++ b/.config/nvim/after/ftplugin/go.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('go', function(conf) + conf.indent(conf.TAB, 4) +end)
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/go.vim b/.config/nvim/after/ftplugin/go.vim deleted file mode 100644 index 54aa34b..0000000 --- a/.config/nvim/after/ftplugin/go.vim +++ /dev/null @@ -1,17 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_go_after') - finish -endif - - - -FtpluginSetLocal noexpandtab -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 -FtpluginSetLocal tabstop=4 - - - -let b:did_ftplugin_go_after = 1
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/haskell.lua b/.config/nvim/after/ftplugin/haskell.lua new file mode 100644 index 0000000..aa87e7b --- /dev/null +++ b/.config/nvim/after/ftplugin/haskell.lua @@ -0,0 +1,8 @@ +vimrc.after_ftplugin('haskell', function(conf) + conf.indent(conf.SPACE, 4) + vim.g.hs_highlight_boolean = true + vim.g.hs_highlight_types = true + vim.g.hs_highlight_more_types = true + vim.g.hs_highlight_debug = true + vim.g.hs_allow_hash_operator = true +end) diff --git a/.config/nvim/after/ftplugin/haskell.vim b/.config/nvim/after/ftplugin/haskell.vim deleted file mode 100644 index 676dcce..0000000 --- a/.config/nvim/after/ftplugin/haskell.vim +++ /dev/null @@ -1,22 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_haskell_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 - -let g:hs_highlight_boolean = v:true -let g:hs_highlight_types = v:true -let g:hs_highlight_more_types = v:true -let g:hs_highlight_debug = v:true -let g:hs_allow_hash_operator = v:true - - - -let b:did_ftplugin_haskell_after = 1 diff --git a/.config/nvim/after/ftplugin/html.lua b/.config/nvim/after/ftplugin/html.lua new file mode 100644 index 0000000..8ddc31f --- /dev/null +++ b/.config/nvim/after/ftplugin/html.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('html', function(conf) + conf.indent(conf.SPACE, 2) +end)
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/html.vim b/.config/nvim/after/ftplugin/html.vim deleted file mode 100644 index a7b36ad..0000000 --- a/.config/nvim/after/ftplugin/html.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_html_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_html_after = 1
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/javascript.lua b/.config/nvim/after/ftplugin/javascript.lua new file mode 100644 index 0000000..49566fc --- /dev/null +++ b/.config/nvim/after/ftplugin/javascript.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('javascript', function(conf) + conf.indent(conf.SPACE, 2) +end) diff --git a/.config/nvim/after/ftplugin/javascript.vim b/.config/nvim/after/ftplugin/javascript.vim deleted file mode 100644 index a79e644..0000000 --- a/.config/nvim/after/ftplugin/javascript.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_javascript_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_javascript_after = 1 diff --git a/.config/nvim/after/ftplugin/json.lua b/.config/nvim/after/ftplugin/json.lua new file mode 100644 index 0000000..6fcd38b --- /dev/null +++ b/.config/nvim/after/ftplugin/json.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('json', function(conf) + conf.indent(conf.SPACE, 2) +end) diff --git a/.config/nvim/after/ftplugin/json.vim b/.config/nvim/after/ftplugin/json.vim deleted file mode 100644 index 9886a95..0000000 --- a/.config/nvim/after/ftplugin/json.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_json_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_json_after = 1 diff --git a/.config/nvim/after/ftplugin/lisp.lua b/.config/nvim/after/ftplugin/lisp.lua new file mode 100644 index 0000000..df60187 --- /dev/null +++ b/.config/nvim/after/ftplugin/lisp.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('lisp', function(conf) + conf.indent(conf.SPACE, 2) +end) diff --git a/.config/nvim/after/ftplugin/lisp.vim b/.config/nvim/after/ftplugin/lisp.vim deleted file mode 100644 index 13c1abc..0000000 --- a/.config/nvim/after/ftplugin/lisp.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_lisp_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_lisp_after = 1 diff --git a/.config/nvim/after/ftplugin/lua.lua b/.config/nvim/after/ftplugin/lua.lua new file mode 100644 index 0000000..9e0e5e6 --- /dev/null +++ b/.config/nvim/after/ftplugin/lua.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('lua', function(conf) + conf.indent(conf.SPACE, 3) +end) diff --git a/.config/nvim/after/ftplugin/lua.vim b/.config/nvim/after/ftplugin/lua.vim deleted file mode 100644 index d0eb8b2..0000000 --- a/.config/nvim/after/ftplugin/lua.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_lua_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=3 -FtpluginSetLocal softtabstop=3 - - - -let b:did_ftplugin_lua_after = 1 diff --git a/.config/nvim/after/ftplugin/markdown.lua b/.config/nvim/after/ftplugin/markdown.lua new file mode 100644 index 0000000..6d6fd2d --- /dev/null +++ b/.config/nvim/after/ftplugin/markdown.lua @@ -0,0 +1,4 @@ +vimrc.after_ftplugin('markdown', function(conf) + conf.indent(conf.SPACE, 4) + vim.g.markdown_syntax_conceal = false +end) diff --git a/.config/nvim/after/ftplugin/markdown.vim b/.config/nvim/after/ftplugin/markdown.vim deleted file mode 100644 index 36791bc..0000000 --- a/.config/nvim/after/ftplugin/markdown.vim +++ /dev/null @@ -1,18 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_markdown_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 - -let g:markdown_syntax_conceal = v:false - - - -let b:did_ftplugin_markdown_after = 1 diff --git a/.config/nvim/after/ftplugin/php.lua b/.config/nvim/after/ftplugin/php.lua new file mode 100644 index 0000000..8c03f57 --- /dev/null +++ b/.config/nvim/after/ftplugin/php.lua @@ -0,0 +1,15 @@ +vimrc.after_ftplugin('php', function(conf) + conf.indent(conf.SPACE, 2) + + -- If a buffer is empty, insert `<?php` tag and 2 blank lines, and position the + -- cursor at the end of the buffer (line 3, column 0). + -- + -- Example: + -- <?php + -- + -- [cursor] + if vim.fn.line('$') == 1 and vim.fn.getline(1) == '' then + vim.fn.setline(1, { '<?php', '', '' }) + vim.fn.cursor(3, 0) + end +end) diff --git a/.config/nvim/after/ftplugin/php.vim b/.config/nvim/after/ftplugin/php.vim deleted file mode 100644 index ec7fd3e..0000000 --- a/.config/nvim/after/ftplugin/php.vim +++ /dev/null @@ -1,30 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_php_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -" If a buffer is empty, insert `<?php` tag and 2 blank lines, and position the -" cursor at the end of the buffer (line 3, column 0). -" -" Example: -" <?php -" -" [cursor] -if line('$') ==# 1 && empty(getline(1)) - call setline(1, ['<?php', '', '']) - call cursor(3, 0) -endif - - - -let b:did_ftplugin_php_after = 1 diff --git a/.config/nvim/after/ftplugin/python.lua b/.config/nvim/after/ftplugin/python.lua new file mode 100644 index 0000000..286c323 --- /dev/null +++ b/.config/nvim/after/ftplugin/python.lua @@ -0,0 +1,5 @@ +vimrc.after_ftplugin('python', function(conf) + conf.indent(conf.SPACE, 4) + vim.g.python_highlight_all = true + vim.g.pyindent_continue = 4 +end)
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/python.vim b/.config/nvim/after/ftplugin/python.vim deleted file mode 100644 index edeac06..0000000 --- a/.config/nvim/after/ftplugin/python.vim +++ /dev/null @@ -1,21 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_python_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 - -let g:python_highlight_all = v:true - -" Overrides the default value: shiftwidth()*2 -let g:pyindent_continue = shiftwidth() - - - -let b:did_ftplugin_python_after = 1
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/qf.lua b/.config/nvim/after/ftplugin/qf.lua new file mode 100644 index 0000000..3a12dbe --- /dev/null +++ b/.config/nvim/after/ftplugin/qf.lua @@ -0,0 +1,14 @@ +vimrc.after_ftplugin('qf', function(conf) + vim.cmd([=[ + nnoremap <buffer> p <CR>zz<C-w>p + nnoremap <silent> <buffer> dd :call Qf_del_entry()<CR> + xnoremap <silent> <buffer> d :call Qf_del_entry()<CR> + + function! Qf_del_entry() range + let qf = getqflist() + unlet! qf[a:firstline - 1 : a:lastline - 1] + call setqflist(qf, 'r') + execute a:firstline + endfunction + ]=]) +end) diff --git a/.config/nvim/after/ftplugin/qf.vim b/.config/nvim/after/ftplugin/qf.vim deleted file mode 100644 index 364759c..0000000 --- a/.config/nvim/after/ftplugin/qf.vim +++ /dev/null @@ -1,40 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_qf_after') - finish -endif - - - -nnoremap <buffer> p <Return>zz<C-w>p -nnoremap <silent> <buffer> dd :call <SID>del_entry()<Return> -xnoremap <silent> <buffer> d :call <SID>del_entry()<Return> -nnoremap <silent> <buffer> u :<C-u>call <SID>undo_entry()<Return> - - -if exists('*s:undo_entry') - finish -endif - - -function! s:undo_entry() - let history = get(w:, 'qf_history', []) - if !empty(history) - call setqflist(remove(history, -1), 'r') - endif -endfunction - -function! s:del_entry() range - let qf = getqflist() - let history = get(w:, 'qf_history', []) - call add(history, copy(qf)) - let w:qf_history = history - unlet! qf[a:firstline - 1 : a:lastline - 1] - call setqflist(qf, 'r') - execute a:firstline -endfunction - - - -let b:did_ftplugin_qf_after = 1 diff --git a/.config/nvim/after/ftplugin/ruby.lua b/.config/nvim/after/ftplugin/ruby.lua new file mode 100644 index 0000000..62e1ee3 --- /dev/null +++ b/.config/nvim/after/ftplugin/ruby.lua @@ -0,0 +1,4 @@ +vimrc.after_ftplugin('ruby', function(conf) + conf.indent(conf.SPACE, 2) + vim.g.ruby_space_errors = true +end) diff --git a/.config/nvim/after/ftplugin/ruby.vim b/.config/nvim/after/ftplugin/ruby.vim deleted file mode 100644 index 0421a5a..0000000 --- a/.config/nvim/after/ftplugin/ruby.vim +++ /dev/null @@ -1,18 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_ruby_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - -let g:ruby_space_errors = v:true - - - -let b:did_ftplugin_ruby_after = 1 diff --git a/.config/nvim/after/ftplugin/toml.lua b/.config/nvim/after/ftplugin/toml.lua new file mode 100644 index 0000000..cc0a03f --- /dev/null +++ b/.config/nvim/after/ftplugin/toml.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('toml', function(conf) + conf.indent(conf.SPACE, 2) +end) diff --git a/.config/nvim/after/ftplugin/toml.vim b/.config/nvim/after/ftplugin/toml.vim deleted file mode 100644 index 84f6ca7..0000000 --- a/.config/nvim/after/ftplugin/toml.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_toml_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_toml_after = 1 diff --git a/.config/nvim/after/ftplugin/typescript.lua b/.config/nvim/after/ftplugin/typescript.lua new file mode 100644 index 0000000..f16d282 --- /dev/null +++ b/.config/nvim/after/ftplugin/typescript.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('typescript', function(conf) + conf.indent(conf.SPACE, 2) +end) diff --git a/.config/nvim/after/ftplugin/typescript.vim b/.config/nvim/after/ftplugin/typescript.vim deleted file mode 100644 index cdb1674..0000000 --- a/.config/nvim/after/ftplugin/typescript.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_typescript_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_typescript_after = 1 diff --git a/.config/nvim/after/ftplugin/vim.lua b/.config/nvim/after/ftplugin/vim.lua new file mode 100644 index 0000000..6f1a84e --- /dev/null +++ b/.config/nvim/after/ftplugin/vim.lua @@ -0,0 +1,7 @@ +vimrc.after_ftplugin('vim', function(conf) + conf.indent(conf.SPACE, 4) + vim.wo.colorcolumn = '+1' + vim.bo.keywordprg = ':help' + vim.bo.textwidth = 78 + vim.g.vim_indent_cont = 4 +end)
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/vim.vim b/.config/nvim/after/ftplugin/vim.vim deleted file mode 100644 index 1ffa6a3..0000000 --- a/.config/nvim/after/ftplugin/vim.vim +++ /dev/null @@ -1,22 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_vim_after') - finish -endif - - - -FtpluginSetLocal colorcolumn=+1 -FtpluginSetLocal expandtab -FtpluginSetLocal iskeyword-=# -FtpluginSetLocal keywordprg=:help -FtpluginSetLocal shiftwidth=4 -FtpluginSetLocal softtabstop=4 -FtpluginSetLocal textwidth=78 - -let g:vim_indent_cont = 4 - - - -let b:did_ftplugin_vim_after = 1
\ No newline at end of file diff --git a/.config/nvim/after/ftplugin/yaml.lua b/.config/nvim/after/ftplugin/yaml.lua new file mode 100644 index 0000000..f810b54 --- /dev/null +++ b/.config/nvim/after/ftplugin/yaml.lua @@ -0,0 +1,3 @@ +vimrc.after_ftplugin('yaml', function(conf) + conf.indent(conf.SPACE, 2) +end) diff --git a/.config/nvim/after/ftplugin/yaml.vim b/.config/nvim/after/ftplugin/yaml.vim deleted file mode 100644 index 5b4734e..0000000 --- a/.config/nvim/after/ftplugin/yaml.vim +++ /dev/null @@ -1,16 +0,0 @@ -scriptencoding utf-8 - - -if exists('b:did_ftplugin_yaml_after') - finish -endif - - - -FtpluginSetLocal expandtab -FtpluginSetLocal shiftwidth=2 -FtpluginSetLocal softtabstop=2 - - - -let b:did_ftplugin_yaml_after = 1 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index b78c407..b7a4249 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,12 +1,12 @@ ---[==========================================================================[-- --- -- --- _ __ _ _ _ _ -- --- _ ____ _(_)_ __ ___ / / (_)_ __ (_) |_ | |_ _ __ _ -- --- | '_ \ \ / / | '_ ` _ \ / / | | '_ \| | __| | | | | |/ _` | -- --- | | | \ V /| | | | | | | / / | | | | | | |_ _| | |_| | (_| | -- --- |_| |_|\_/ |_|_| |_| |_| /_/ |_|_| |_|_|\__(_)_|\__,_|\__,_| -- --- -- ---]==========================================================================]-- +--[========================================================================[-- +-- -- +-- _ __ _ _ _ _ -- +-- _ ____ _(_)_ __ ___ / / (_)_ __ (_) |_ | |_ _ __ _ -- +-- | '_ \ \ / / | '_ ` _ \ / / | | '_ \| | __| | | | | |/ _` | -- +-- | | | \ V /| | | | | | | / / | | | | | | |_ _| | |_| | (_| | -- +-- |_| |_|\_/ |_|_| |_| |_| /_/ |_|_| |_|_|\__(_)_|\__,_|\__,_| -- +-- -- +--]========================================================================]-- @@ -1054,43 +1054,6 @@ command! -bar -range=% --- ftplugin {{{1 - --- This command do the followings: --- * Execute |:setlocal| for each options. --- * Set information to restore the original setting to b:|undo_ftplugin|. - --- This command is used in my/ftplugin/*.vim. - --- Note: specify only single option. - -vim.cmd([[ -function My_ftplugin_setlocal(qargs) - execute 'setlocal' a:qargs - - let option_name = substitute(a:qargs, '\L.*', '', '') - - if option_name ==# 'shiftwidth' && exists(':IndentLinesReset') ==# 2 - IndentLinesReset - end - - if exists('b:undo_ftplugin') - let b:undo_ftplugin .= '|setlocal ' .. option_name .. '<' - else - let b:undo_ftplugin = 'setlocal ' .. option_name .. '<' - end -endfunction -]]) - -vim.cmd([[ -command! -nargs=+ - \ FtpluginSetLocal - \ call My_ftplugin_setlocal(<q-args>) -]]) - - - - -- Appearance {{{1 -- Color scheme {{{2 @@ -1884,7 +1847,3 @@ G.yankround_use_region_hl = true --- Modelines {{{1 - --- vim: expandtab:softtabstop=3:shiftwidth=3:textwidth=80:colorcolumn=+1: --- vim: foldenable:foldmethod=marker:foldlevel=0: diff --git a/.config/nvim/lua/vimrc.lua b/.config/nvim/lua/vimrc.lua index 4520c5b..80a02bc 100644 --- a/.config/nvim/lua/vimrc.lua +++ b/.config/nvim/lua/vimrc.lua @@ -15,5 +15,31 @@ function vimrc.autocmd(event, filter, callback) end +local conf = {} +conf.SPACE = true +conf.TAB = false +function conf.indent(style, width) + vim.bo.expandtab = style + vim.bo.tabstop = width + vim.bo.shiftwidth = width + vim.bo.softtabstop = width + + if vim.fn.exists(':IndentLinesReset') == 2 then + vim.cmd('IndentLinesReset') + end +end + +function vimrc.after_ftplugin(ft, callback) + local var_name = 'did_ftplugin_' .. ft .. '_after' + if vim.b[var_name] ~= nil then + return + end + + callback(conf) + + vim.b[var_name] = true +end + + return vimrc |