From e40e156d859225ff61552f82d386181f5cbf0ce8 Mon Sep 17 00:00:00 2001 From: afranco Date: Sat, 30 Mar 2024 16:08:40 +0000 Subject: [PATCH] chore(nvim): updated config --- .config/nvim/ftdetect/sage.vim | 5 +++ .config/nvim/lua/plugins/cmp.lua | 8 ----- .config/nvim/lua/plugins/conform.lua | 5 +-- .config/nvim/lua/plugins/lazy.lua | 14 +++++---- .config/nvim/lua/plugins/lspconfig.lua | 42 +++++++++++++++++++------- 5 files changed, 45 insertions(+), 29 deletions(-) create mode 100644 .config/nvim/ftdetect/sage.vim diff --git a/.config/nvim/ftdetect/sage.vim b/.config/nvim/ftdetect/sage.vim new file mode 100644 index 0000000..50c57ad --- /dev/null +++ b/.config/nvim/ftdetect/sage.vim @@ -0,0 +1,5 @@ + +augroup SageDetect + au! + au BufRead,BufNewFile *sage set ft=python +augroup END diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index cd47cce..fa390ac 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -19,14 +19,6 @@ if not lspkind_status_ok then return end -cmp.event:on("menu_opened", function() - vim.b.copilot_suggestion_hidden = true -end) - -cmp.event:on("menu_closed", function() - vim.b.copilot_suggestion_hidden = false -end) - -- 󰃐 󰆩 󰙅 󰛡  󰅲 some other good icons local kind_icons = { Text = "󰉿", diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua index 142fac8..e826827 100644 --- a/.config/nvim/lua/plugins/conform.lua +++ b/.config/nvim/lua/plugins/conform.lua @@ -4,8 +4,5 @@ require("conform").setup({ javascript = { "prettierd" }, markdown = { "mdformat" }, json = {"jq"} - }, - format_on_save = { - lsp_fallback = true, - }, + } }) diff --git a/.config/nvim/lua/plugins/lazy.lua b/.config/nvim/lua/plugins/lazy.lua index b2e7a37..615778c 100644 --- a/.config/nvim/lua/plugins/lazy.lua +++ b/.config/nvim/lua/plugins/lazy.lua @@ -156,7 +156,7 @@ lazy.setup({ { "rcarriga/nvim-dap-ui", event = "VeryLazy", - dependencies = "mfussenegger/nvim-dap", + dependencies = {"mfussenegger/nvim-dap","nvim-neotest/nvim-nio"}, config = function() local dap = require("dap") local dapui = require("dapui") @@ -220,11 +220,13 @@ lazy.setup({ end, }, - { - "mrcjkb/rustaceanvim", - version = "^4", -- Recommended - ft = { "rust" }, - }, + 'tpope/vim-commentary', + + -- { + -- "mrcjkb/rustaceanvim", + -- version = "^4", -- Recommended + -- ft = { "rust" }, + -- }, "barreiroleo/ltex-extra.nvim", diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index 5a831d0..da6593e 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -15,6 +15,9 @@ vim.api.nvim_create_autocmd("LspAttach", { local telescope = require("telescope.builtin") local conform = require("conform") + local client = vim.lsp.get_client_by_id(ev.data.client_id) + client.server_capabilities.semanticTokensProvider = nil + -- Mappings. -- See `:help vim.lsp.*` for documentation on any of the below functions local bufopts = { noremap = true, silent = true, buffer = ev.buf } @@ -62,12 +65,6 @@ mason_lspconfig.setup_handlers({ }, }) end, - ["hls"] = function() - lspconfig["hls"].setup({ - capabilities = capabilities, - filetypes = { 'haskell', 'lhaskell', 'cabal' }, - }) - end, ["ltex"] = function() lspconfig["ltex"].setup({ capabilities = capabilities, @@ -77,15 +74,38 @@ mason_lspconfig.setup_handlers({ require("ltex_extra").setup() end, }) + end, + ["basedpyright"] = function () + lspconfig["basedpyright"].setup({ + capabilities = capabilities, + settings = { + verboseOutput = true, + autoImportCompletion = true, + basedpyright = { + analysis = { + typeCheckingMode = "all", + autoSearchPaths = true, + useLibraryCodeForTypes = true, + diagnosticMode = "openFilesOnly", + indexing = true, + }, + }, + }, + }) end +}) +lspconfig["hls"].setup({ + capabilities = capabilities, + filetypes = { 'haskell', 'lhaskell', 'cabal' }, }) -vim.g.rustaceanvim = { - server = { - capabilities = capabilities, - }, -} + +--vim.g.rustaceanvim = { +-- server = { +-- capabilities = capabilities, +-- }, +--}