update autoformat

This commit is contained in:
Chris 2021-03-22 22:10:58 -04:00
parent 49e0537597
commit 6d0c0efad8

View file

@ -21,35 +21,27 @@ function nv_utils.define_augroups(definitions) -- {{{1
vim.cmd('augroup END') vim.cmd('augroup END')
end end
end end
nv_utils.define_augroups({ nv_utils.define_augroups({
_general_settings = { _general_settings = {
{ {'TextYankPost', '*', 'lua require(\'vim.highlight\').on_yank({higroup = \'Search\', timeout = 200})'},
'TextYankPost', '*', {'BufWinEnter', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'},
'lua require(\'vim.highlight\').on_yank({higroup = \'Search\', timeout = 200})'
}, {'BufWinEnter', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'},
{'BufRead', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'}, {'BufRead', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'},
{'BufNewFile', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'}, {'BufNewFile', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'},
{'FileType', 'java', 'luafile ~/.config/nvim/lua/lsp/java-ls.lua'}, {'FileType', 'java', 'luafile ~/.config/nvim/lua/lsp/java-ls.lua'},
{'FileType', 'java', 'nnoremap ca <Cmd>lua require(\'jdtls\').code_action()<CR>'}, {'FileType', 'java', 'nnoremap ca <Cmd>lua require(\'jdtls\').code_action()<CR>'},
{'FileType', 'java', 'nnoremap ca <Cmd>lua require(\'jdtls\').code_action()<CR>'}, {'FileType', 'java', 'nnoremap ca <Cmd>lua require(\'jdtls\').code_action()<CR>'},
{'FileType', 'markdown', 'setlocal wrap'}, {'FileType', 'markdown', 'setlocal wrap'}, {'FileType', 'markdown', 'setlocal spell'},
{'FileType', 'markdown', 'setlocal spell'}, {'BufWinEnter', '.sol', 'setlocal filetype=solidity'},
-- {'BufWinEnter', '.sol', 'setlocal filetype=solidity'},
{ 'FileType', 'dashboard', 'set showtabline=0 | autocmd WinLeave <buffer> set showtabline=2'}, {'FileType', 'dashboard', 'set showtabline=0 | autocmd WinLeave <buffer> set showtabline=2'},
-- { 'FileType', '*', 'setlocal number'},
-- { 'FileType', 'NeogitStatus', 'setlocal nonumber'},
-- { 'FileType', 'dashboard', 'setlocal nonumber'},
-- { 'FileType', 'qf', 'setlocal nonumber'},
-- { 'FileType', 'floaterm', 'setlocal nonumber'},
-- { 'FileType', 'NvimTree', 'setlocal nonumber'},
-- { 'FileType', 'rnvimr', 'setlocal nonumber'},
-- { 'FileType', 'TelescopePrompt', 'setlocal nonumber'},
-- { 'FileType', 'dashboard', 'setlocal nocursorline'},
-- { 'FileType', 'dashboard', 'set nonumber | autocmd WinLeave <buffer> set number'},
{'BufRead', '*.sol', 'setlocal filetype=solidity'}, {'BufRead', '*.sol', 'setlocal filetype=solidity'},
{'BufNewFile', '*.sol', 'setlocal filetype=solidity'} {'BufNewFile', '*.sol', 'setlocal filetype=solidity'},
-- autocmd! BufRead,BufNewFile *.{jsx,jx,js} setlocal filetype=javascript.jsx {'BufWritePre', '*.jsx', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'},
{'BufWritePre', '*.js', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'},
{'BufWritePre', '*.py', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'},
{'BufWritePre', '*.lua', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'},
{'BufWritePre', '*.json', 'lua vim.lsp.buf.formatting_sync(nil, 1000)'}
-- {'User', 'GoyoLeave', 'lua require(\'galaxyline\').disable_galaxyline()'}, -- {'User', 'GoyoLeave', 'lua require(\'galaxyline\').disable_galaxyline()'},
-- {'User', 'GoyoEnter', 'lua require(\'galaxyline\').galaxyline_augroup()'}, -- {'User', 'GoyoEnter', 'lua require(\'galaxyline\').galaxyline_augroup()'},
} }
@ -214,12 +206,14 @@ end
-- misc -- misc
function nv_utils.file_exists(name) function nv_utils.file_exists(name)
local f=io.open(name,"r") local f = io.open(name, "r")
if f~=nil then io.close(f) return true else return false end if f ~= nil then
io.close(f)
return true
else
return false
end
end end
-- autoformat
-- autocmd BufWritePre *.rs lua vim.lsp.buf.formatting_sync(nil, 1000)
return nv_utils return nv_utils