From 192e7d3c23a35ccab399e6dfbaab8c87e45926ef Mon Sep 17 00:00:00 2001 From: thomasabishop Date: Mon, 28 Oct 2024 14:00:13 +0000 Subject: [PATCH] nvim: add better md support --- nvim/lua/config/options.lua | 2 + nvim/lua/plugins/lspconfig.lua | 144 ++++++++++++++++----------------- 2 files changed, 74 insertions(+), 72 deletions(-) diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index ed50790..8cccc0d 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua @@ -31,6 +31,8 @@ opt.wrap = false opt.formatoptions = "cro" opt.backspace = "indent,eol,start" opt.conceallevel = 0 +opt.spelllang = "en_gb" +vim.opt.spell = true diagnostic.config({ virtual_text = false, diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua index c70d179..7aad58b 100644 --- a/nvim/lua/plugins/lspconfig.lua +++ b/nvim/lua/plugins/lspconfig.lua @@ -1,76 +1,76 @@ return { - "neovim/nvim-lspconfig", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { - "hrsh7th/cmp-nvim-lsp", - { "folke/neodev.nvim", opts = {} }, - }, - config = function() - local nvim_lsp = require("lspconfig") - local mason_lspconfig = require("mason-lspconfig") - local on_attach = function(client, bufnr) - -- format on save - if client.server_capabilities.documentFormattingProvider then - vim.api.nvim_create_autocmd("BufWritePre", { - group = vim.api.nvim_create_augroup("Format", { clear = true }), - buffer = bufnr, - callback = function() - vim.lsp.buf.format() - end, - }) - end - end + "neovim/nvim-lspconfig", + event = { "BufReadPre", "BufNewFile" }, + dependencies = { + "hrsh7th/cmp-nvim-lsp", + { "folke/neodev.nvim", opts = {} }, + }, + config = function() + local nvim_lsp = require("lspconfig") + local mason_lspconfig = require("mason-lspconfig") + local on_attach = function(client, bufnr) + -- format on save + if client.server_capabilities.documentFormattingProvider then + vim.api.nvim_create_autocmd("BufWritePre", { + group = vim.api.nvim_create_augroup("Format", { clear = true }), + buffer = bufnr, + callback = function() + vim.lsp.buf.format() + end, + }) + end + end - local capabilities = require("cmp_nvim_lsp").default_capabilities() - mason_lspconfig.setup_handlers({ - function(server) - nvim_lsp[server].setup({ - capabilities = capabilities, - }) - end, - ["ts_ls"] = function() - nvim_lsp["ts_ls"].setup({ - on_attach = on_attach, - capabilities = capabilities, - }) - end, - ["cssls"] = function() - nvim_lsp["cssls"].setup({ - on_attach = on_attach, - capabilities = capabilities, - }) - end, - ["html"] = function() - nvim_lsp["html"].setup({ - on_attach = on_attach, - capabilities = capabilities, - }) - end, - ["jsonls"] = function() - nvim_lsp["jsonls"].setup({ - on_attach = on_attach, - capabilities = capabilities, - }) - end, - ["eslint"] = function() - nvim_lsp["eslint"].setup({ - on_attach = on_attach, - capabilities = capabilities, - }) - end, - ["pyright"] = function() - nvim_lsp["pyright"].setup({ - on_attach = on_attach, - capabilities = capabilities, - }) - end, + local capabilities = require("cmp_nvim_lsp").default_capabilities() + mason_lspconfig.setup_handlers({ + function(server) + nvim_lsp[server].setup({ + capabilities = capabilities, + }) + end, + ["ts_ls"] = function() + nvim_lsp["ts_ls"].setup({ + on_attach = on_attach, + capabilities = capabilities, + }) + end, + ["cssls"] = function() + nvim_lsp["cssls"].setup({ + on_attach = on_attach, + capabilities = capabilities, + }) + end, + ["html"] = function() + nvim_lsp["html"].setup({ + on_attach = on_attach, + capabilities = capabilities, + }) + end, + ["jsonls"] = function() + nvim_lsp["jsonls"].setup({ + on_attach = on_attach, + capabilities = capabilities, + }) + end, + ["eslint"] = function() + nvim_lsp["eslint"].setup({ + on_attach = on_attach, + capabilities = capabilities, + }) + end, + ["pyright"] = function() + nvim_lsp["pyright"].setup({ + on_attach = on_attach, + capabilities = capabilities, + }) + end, - ["marksman"] = function() - nvim_lsp["pyright"].setup({ - on_attach = on_attach, - capabilities = capabilities, - }) - end, - }) - end, + ["marksman"] = function() + nvim_lsp["marksman"].setup({ + on_attach = on_attach, + capabilities = capabilities, + }) + end, + }) + end, }