From f3a53350ef1e762cdd635d1e8622d0055d71cf4b Mon Sep 17 00:00:00 2001 From: Stefan Weigl-Bosker Date: Mon, 14 Apr 2025 22:12:58 -0400 Subject: statusline and other stuff --- modules/neovim/nvim/lua/config/lsp/init.lua | 24 +++++++++++++----------- modules/neovim/nvim/lua/config/lsp/lua_ls.lua | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 modules/neovim/nvim/lua/config/lsp/lua_ls.lua (limited to 'modules/neovim/nvim/lua/config/lsp') diff --git a/modules/neovim/nvim/lua/config/lsp/init.lua b/modules/neovim/nvim/lua/config/lsp/init.lua index 2de2d22..5c75827 100644 --- a/modules/neovim/nvim/lua/config/lsp/init.lua +++ b/modules/neovim/nvim/lua/config/lsp/init.lua @@ -6,7 +6,8 @@ local map = vim.keymap.set vim.lsp.config = { ['clangd'] = require("config.lsp.clangd"), - ['zls'] = require("config.lsp.zls") + ['zls'] = require("config.lsp.zls"), + ['lua_ls'] = require("config.lsp.lua_ls"), } local servers = { @@ -88,15 +89,16 @@ vim.api.nvim_create_autocmd("LspAttach", { callback = function(args) end end}) -local lspconfig = require('lspconfig') +-- local lspconfig = require('lspconfig') -for server, config in pairs(servers) do --- config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities) - vim.lsp.config[server].settings = config - vim.lsp.enable(server) - lspconfig.rust_analyzer.setup({}) --- lspconfig[server].setup({}) -end +-- for server, config in pairs(servers) do +-- -- config.capabilities = require('blink.cmp').get_lsp_capabilities(config.capabilities) +-- -- vim.lsp.config[server].settings = config +-- -- vim.lsp.config[server] = config +-- -- vim.lsp.enable(server) +-- -- lspconfig.rust_analyzer.setup({}) +-- -- lspconfig[server].setup({}) +-- end --- vim.lsp.config['clangd'] = require('config.lsp.clangd') --- vim.lsp.enable('clangd') +-- vim.lsp.enable({'lua_ls', 'zls', 'clangd'}) +vim.lsp.enable({'zls', 'clangd'}) diff --git a/modules/neovim/nvim/lua/config/lsp/lua_ls.lua b/modules/neovim/nvim/lua/config/lsp/lua_ls.lua new file mode 100644 index 0000000..5e0875a --- /dev/null +++ b/modules/neovim/nvim/lua/config/lsp/lua_ls.lua @@ -0,0 +1,15 @@ +return { + cmd = { "lua-language-server" }, + filetypes = { "lua" }, + root_dir = { + '.luarc.json', + '.luarc.jsonc', + '.luacheckrc', + '.stylua.toml', + 'stylua.toml', + 'selene.toml', + 'selene.yml', + '.git', + }, + single_file_support = true, +} -- cgit v1.2.3