Cloonar/nixos
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: correct API calls in lspconfig and utils, ensure proper setup for none-ls

Browse Source
This commit is contained in:
Dominik Polakovics Polakovics
2025-05-30 00:31:36 +02:00
parent a36b1e8310
commit d161d5f421
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/nb/modules/nvim/config/lspconfig.lua
View File

@@ -13,7 +13,7 @@ local protocol = require('vim.lsp.protocol')
local on_attach = function(client, buffnr) local on_attach = function(client, buffnr)
if client.server.capabilities.documentFormattingProvider then 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 }), group = vim.api.nvim_create_augroup("format", { clear = true }),
buffer = buffnr, buffer = buffnr,
callback = function() vim.lsp.buf.formatting_seq_sync() end 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.textDocument.completion.completionItem.snippetSupport = true
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) 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 for _, lsp in pairs(servers) do
require('lspconfig')[lsp].setup { require('lspconfig')[lsp].setup {
-- on_attach = on_attach, -- on_attach = on_attach,
@@ -45,7 +45,7 @@ lspc.yamlls.setup({
vim.api.nvim_create_autocmd("FileType", { vim.api.nvim_create_autocmd("FileType", {
pattern = "json", pattern = "json",
callback = function(ev) callback = function(ev)
vim.bo[ev.buf].formatprg = “jq” vim.bo[ev.buf].formatprg = "jq"
print("It's a json file") print("It's a json file")
end, end,
}) })

32
hosts/nb/modules/nvim/config/utils.lua
View File

@@ -1,17 +1,23 @@
-- none-ls -- none-ls
local nb = require('none-ls').builtins local status_ok_nls, none_ls_module = pcall(require, "none-ls")
if not status_ok_nls then
require('none-ls').setup({ vim.notify("none-ls plugin not found or failed to load. Check Nix config and plugin paths.", vim.log.levels.WARN)
sources = { else
nb.formatting.alejandra, local nb = none_ls_module.builtins
nb.code_actions.statix, none_ls_module.setup({
nb.diagnostics.cppcheck, sources = {
nb.diagnostics.deadnix, nb.formatting.alejandra,
nb.diagnostics.statix, nb.code_actions.statix,
nb.diagnostics.eslint, nb.diagnostics.cppcheck,
nb.completion.spell, 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() require("gitsigns").setup()