From 6db99389bc997213e9fa7ac3951612ff28e7cfaf Mon Sep 17 00:00:00 2001 From: Lucas Sta Maria Date: Wed, 8 Feb 2023 00:31:48 -0500 Subject: [PATCH] fix: add trouble and formatter nvim plugins Signed-off-by: Lucas Sta Maria --- .config/nvim/ftplugin/tex.lua | 2 -- .config/nvim/lua/lsp.lua | 6 +----- .config/nvim/lua/mappings.lua | 5 ++++- .config/nvim/lua/plugins.lua | 7 +++++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.config/nvim/ftplugin/tex.lua b/.config/nvim/ftplugin/tex.lua index ff2d432..1586492 100644 --- a/.config/nvim/ftplugin/tex.lua +++ b/.config/nvim/ftplugin/tex.lua @@ -7,8 +7,6 @@ local function map(mode, lhs, rhs, opts) vim.api.nvim_set_keymap(mode, lhs, rhs, options) end -require("nvim-autopairs").setup {} - map("i", "", ":w:!just") map("n", "", ":w:!just") diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index 307ecc7..ab4b9ba 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -30,7 +30,6 @@ cmp.setup({ { name = 'nvim_lsp' }, { name = 'ultisnips' }, -- For ultisnips users. }, { - { name = 'buffer' }, }) }) @@ -151,9 +150,6 @@ lspconfig.java_language_server.setup { lspconfig.racket_langserver.setup { on_attach = on_attach, capabilities = capabilities, - root_dir = lspconfig.util.root_pattern( - 'main.rkt' - ) } lspconfig.ocamllsp.setup { @@ -161,7 +157,7 @@ lspconfig.ocamllsp.setup { capabilities = capabilities, } -lspconfig.pylsp.setup { +lspconfig.jedi_language_server.setup { on_attach = on_attach, capabilities = capabilities, } diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua index 4acb9d8..4855a5e 100644 --- a/.config/nvim/lua/mappings.lua +++ b/.config/nvim/lua/mappings.lua @@ -8,7 +8,7 @@ local function map(mode, lhs, rhs, opts) end -- format -map('n', 'f', ':Format') +map('n', 'f', ':w:Format') -- open terminal map("n", "ott", ":ToggleTerm") @@ -56,3 +56,6 @@ map("n", "", ":BufferLineCycleNext") map("n", "", ":BufferLineCyclePrev") map("n", "", ":BufferLineMoveNext") map("n", "", ":BufferLineMovePrev") + +-- trouble +map("n", "od", ":TroubleToggle") diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index ecb552d..994262c 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -32,6 +32,7 @@ packer.startup(function() use("simrat39/symbols-outline.nvim") use("lcheylus/overlength.nvim") use("akinsho/bufferline.nvim") + use("folke/trouble.nvim") -- completion use("hrsh7th/cmp-nvim-lsp") @@ -178,6 +179,9 @@ require('formatter').setup { } end }, + c = { + require('formatter.filetypes.c').clangformat + }, cpp = { require('formatter.filetypes.cpp').clangformat }, @@ -213,3 +217,6 @@ require('Comment').setup {} require("nvim-autopairs").setup { disable_filetype = { "TelescopePrompt", "racket" } } + +-- trouple +require("trouble").setup {}