From 9f71c1c29c1f98542b2b416ac27229b6c4e36b07 Mon Sep 17 00:00:00 2001 From: Wessel Tip Date: Thu, 18 Sep 2025 09:31:49 +0200 Subject: [PATCH] fix(nvim): New lspconfig notation, 4 tab size --- nvim/init.lua | 6 +++--- nvim/lua/plugins/configs/lspconfig.lua | 17 +++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/nvim/init.lua b/nvim/init.lua index 4df85fa..0f53fcd 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -32,10 +32,10 @@ vim.o.hlsearch = false -- Make line numbers default vim.wo.number = true -vim.o.tabstop = 2 -- A TAB character looks like 2 spaces +vim.o.tabstop = 4 -- A TAB character looks like 4 spaces vim.o.expandtab = true -- Pressing the TAB key will insert spaces instead of a TAB character -vim.o.softtabstop = 2 -- Number of spaces inserted instead of a TAB character -vim.o.shiftwidth = 2 -- Number of spaces inserted when indenting +vim.o.softtabstop = 4 -- Number of spaces inserted instead of a TAB character +vim.o.shiftwidth = 4 -- Number of spaces inserted when indenting -- Ruler at 100 characters vim.o.colorcolumn = "100" diff --git a/nvim/lua/plugins/configs/lspconfig.lua b/nvim/lua/plugins/configs/lspconfig.lua index a497e65..c475cff 100644 --- a/nvim/lua/plugins/configs/lspconfig.lua +++ b/nvim/lua/plugins/configs/lspconfig.lua @@ -1,6 +1,5 @@ -local lspconfig = require("lspconfig") - -lspconfig.lua_ls.setup({ +vim.lsp.config.lua_ls = { + cmd = { "lua-language-server" }, settings = { Lua = { diagnostics = { @@ -9,14 +8,16 @@ lspconfig.lua_ls.setup({ }, }, }, -}) +} -lspconfig.rust_analyzer.setup({ +vim.lsp.config.rust_analyzer = { + cmd = { "rust-analyzer" }, cargo = { features = { "all" }, }, -}) +} -lspconfig.gopls.setup({ +vim.lsp.config.gopls = { + cmd = { "gopls" }, filetypes = { "go", "gomod", "gowork", "gotmpl" }, -}) +}