From d161d5f421ecc26ea2bde9aaad5fdc26bfde5384 Mon Sep 17 00:00:00 2001 From: Dominik Polakovics Date: Fri, 30 May 2025 00:31:36 +0200 Subject: [PATCH] fix: correct API calls in lspconfig and utils, ensure proper setup for none-ls --- hosts/nb/modules/nvim/config/lspconfig.lua | 6 ++-- hosts/nb/modules/nvim/config/utils.lua | 32 +++++++++++++--------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/hosts/nb/modules/nvim/config/lspconfig.lua b/hosts/nb/modules/nvim/config/lspconfig.lua index 47070df..94238e9 100644 --- a/hosts/nb/modules/nvim/config/lspconfig.lua +++ b/hosts/nb/modules/nvim/config/lspconfig.lua @@ -13,7 +13,7 @@ local protocol = require('vim.lsp.protocol') local on_attach = function(client, buffnr) if client.server.capabilities.documentFormattingProvider then - vimapi.nvim_create_autocmd("BufWritePre", { + vim.api.nvim_create_autocmd("BufWritePre", { group = vim.api.nvim_create_augroup("format", { clear = true }), buffer = buffnr, callback = function() vim.lsp.buf.formatting_seq_sync() end @@ -25,7 +25,7 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) -local servers = { 'ts_ls', 'lua', 'cssls', 'yamlls', 'intelephense', 'gopls' } +local servers = { 'ts_ls', 'lua_ls', 'cssls', 'yamlls', 'intelephense', 'gopls' } for _, lsp in pairs(servers) do require('lspconfig')[lsp].setup { -- on_attach = on_attach, @@ -45,7 +45,7 @@ lspc.yamlls.setup({ vim.api.nvim_create_autocmd("FileType", { pattern = "json", callback = function(ev) - vim.bo[ev.buf].formatprg = “jq” + vim.bo[ev.buf].formatprg = "jq" print("It's a json file") end, }) diff --git a/hosts/nb/modules/nvim/config/utils.lua b/hosts/nb/modules/nvim/config/utils.lua index a026b3d..b734ca1 100644 --- a/hosts/nb/modules/nvim/config/utils.lua +++ b/hosts/nb/modules/nvim/config/utils.lua @@ -1,17 +1,23 @@ -- none-ls -local nb = require('none-ls').builtins - -require('none-ls').setup({ - sources = { - nb.formatting.alejandra, - nb.code_actions.statix, - nb.diagnostics.cppcheck, - nb.diagnostics.deadnix, - nb.diagnostics.statix, - nb.diagnostics.eslint, - nb.completion.spell, - }, -}) +local status_ok_nls, none_ls_module = pcall(require, "none-ls") +if not status_ok_nls then + vim.notify("none-ls plugin not found or failed to load. Check Nix config and plugin paths.", vim.log.levels.WARN) +else + local nb = none_ls_module.builtins + none_ls_module.setup({ + sources = { + nb.formatting.alejandra, + nb.code_actions.statix, + nb.diagnostics.cppcheck, + nb.diagnostics.deadnix, + nb.diagnostics.statix, + nb.diagnostics.eslint, + nb.completion.spell, + }, + debug = false, -- You can set this to true for more verbose output from none-ls + }) + vim.notify("none-ls setup processed from utils.lua", vim.log.levels.INFO) +end require("gitsigns").setup()