diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lsp/efm-general-ls.lua | 15 | ||||
| -rw-r--r-- | lua/nv-matchup/init.lua | 1 | ||||
| -rw-r--r-- | lua/nv-treesitter/init.lua | 2 | ||||
| -rw-r--r-- | lua/nv-utils/init.lua | 4 | ||||
| -rw-r--r-- | lua/plugins.lua | 16 | ||||
| -rw-r--r-- | lua/settings.lua | 1 |
6 files changed, 26 insertions, 13 deletions
diff --git a/lua/lsp/efm-general-ls.lua b/lua/lsp/efm-general-ls.lua new file mode 100644 index 00000000..fa28dbcf --- /dev/null +++ b/lua/lsp/efm-general-ls.lua @@ -0,0 +1,15 @@ +require"lspconfig".efm.setup { + init_options = {documentFormatting = true}, + filetypes = {"lua"}, + settings = { + rootMarkers = {".git/"}, + languages = { + lua = { + { + formatCommand = "lua-format -i --no-keep-simple-function-one-line --no-break-after-operator --column-limit=150 --break-after-table-lb", + formatStdin = true + } + } + } + } +} diff --git a/lua/nv-matchup/init.lua b/lua/nv-matchup/init.lua new file mode 100644 index 00000000..44949085 --- /dev/null +++ b/lua/nv-matchup/init.lua @@ -0,0 +1 @@ +vim.g.matchup_matchparen_offscreen = {} diff --git a/lua/nv-treesitter/init.lua b/lua/nv-treesitter/init.lua index b83e82a0..c7cd25d4 100644 --- a/lua/nv-treesitter/init.lua +++ b/lua/nv-treesitter/init.lua @@ -14,7 +14,7 @@ require'nvim-treesitter.configs'.setup { }, refactor = { highlight_definitions = { - enable = true + enable = false } } } diff --git a/lua/nv-utils/init.lua b/lua/nv-utils/init.lua index 3fc92d52..43bd762e 100644 --- a/lua/nv-utils/init.lua +++ b/lua/nv-utils/init.lua @@ -30,8 +30,8 @@ nv_utils.define_augroups( {'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>'}, - {'User', 'GoyoLeave', 'lua require(\'galaxyline\').disable_galaxyline()'}, - {'User', 'GoyoEnter', 'lua require(\'galaxyline\').galaxyline_augroup()'}, + -- {'User', 'GoyoLeave', 'lua require(\'galaxyline\').disable_galaxyline()'}, + -- {'User', 'GoyoEnter', 'lua require(\'galaxyline\').galaxyline_augroup()'}, }, } ) diff --git a/lua/plugins.lua b/lua/plugins.lua index 202574d8..08626579 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -105,19 +105,15 @@ return require('packer').startup(function(use) use 'alvan/vim-closetag' use { 'glacambre/firenvim', run = function() vim.fn['firenvim#install'](1) end } use 'liuchengxu/vim-which-key' - use 'tpope/vim-sleuth' use 'voldikss/vim-floaterm' - use 'phaazon/hop.nvim' use 'liuchengxu/vista.vim' - -- use { 'npxbr/glow.nvim', run = ':GlowInstall' } - -- figure out how to disable or configure for things with tags like <div></div> because it will highlight all divs - use 'RRethy/vim-illuminate' use 'terrortylor/nvim-comment' - --use 'tpope/vim-commentary' - --use 'suy/vim-context-commentstring' - -- use 'b3nj5m1n/kommentary' - use 'andymass/vim-matchup' - use 'junegunn/goyo.vim' use 'bfredl/nvim-miniyank' use 'brooth/far.vim' + use 'junegunn/goyo.vim' + use 'andymass/vim-matchup' + use 'tpope/vim-sleuth' + use 'phaazon/hop.nvim' + -- use 'RRethy/vim-illuminate' + -- use 'b3nj5m1n/kommentary' end) diff --git a/lua/settings.lua b/lua/settings.lua index 5c5945cf..2d7c3ac4 100644 --- a/lua/settings.lua +++ b/lua/settings.lua @@ -17,6 +17,7 @@ vim.cmd('set sw=4') --Change the number of space characte vim.bo.expandtab=true --Converts tabs to spaces vim.bo.smartindent=true --Makes indenting smart vim.wo.number = true +vim.o.laststatus = 2 vim.wo.cursorline=true --Enable highlighting of the current line vim.o.showtabline=2 --Always show tabs vim.o.showmode=false --We don't need to see things like -- INSERT -- anymore |