matt/dots
1
0
Fork 0
Code Activity

fix: update plugins on nvim

Browse Source
This commit is contained in:
Matt Threlfall
2025-04-15 19:05:36 +01:00
parent 6c4eb08d89
commit 54b56d22be
5 changed files with 227 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nvim/.config/nvim/lazy-lock.json
View File

@@ -31,6 +31,7 @@
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
"rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" },
"sonarlint.nvim": { "branch": "main", "commit": "1d78aaefbee589ecb04c4f9043acbbbd63b505bd" },
"telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
"ui": { "branch": "v3.0", "commit": "cf498b0c3f75cc65ea809cc3f3cd9bbfa937b042" },
"volt": { "branch": "main", "commit": "c45d5f48da8e802e608b5c6da471ca4d84276dfb" },

26
nvim/.config/nvim/lua/chadrc.lua
View File

@@ -1,6 +1,6 @@
-- This file needs to have same structure as nvconfig.lua
-- This file needs to have same structure as nvconfig.lua
-- https://github.com/NvChad/ui/blob/v3.0/lua/nvconfig.lua
-- Please read that file to know all available options :(
-- Please read that file to know all available options :(
---@type ChadrcConfig
local M = {}
@@ -20,5 +20,27 @@ M.base46 = {
-- lazyload = false
-- }
--}
--
M.mason = {
pkgs = {
"typescript-language-server",
"eslint-lsp",
"lua-language-server",
"html-lsp",
"pyright",
"mypy",
"ruff",
"gopls",
"goimports",
"debugpy",
"rust-analyzer",
"codelldb",
"tailwindcss-language-server",
"golangci-lint-langserver",
"typescript-language-server",
"sonarlint-language-server",
"lua-language-server",
},
}
return M

143
nvim/.config/nvim/lua/configs/lspconfig.lua
View File

@@ -1,78 +1,103 @@
-- load defaults i.e lua_lsp
require("nvchad.configs.lspconfig").defaults()
local lspconfig = require "lspconfig"
local lspconfig = require("lspconfig")
-- EXAMPLE
local servers = { "html", "cssls" }
local nvlsp = require "nvchad.configs.lspconfig"
local nvlsp = require("nvchad.configs.lspconfig")
-- lsps with default config
for _, lsp in ipairs(servers) do
lspconfig[lsp].setup {
on_attach = nvlsp.on_attach,
on_init = nvlsp.on_init,
capabilities = nvlsp.capabilities,
}
lspconfig[lsp].setup({
on_attach = nvlsp.on_attach,
on_init = nvlsp.on_init,
capabilities = nvlsp.capabilities,
})
end
lspconfig.gopls.setup {
on_attach = nvlsp.on_attach,
capabilities = nvlsp.capabilities,
cmd = { "gopls" },
filetypes = { "go", "gomod", "gowork", "gotmpl" },
settings = {
completeUnimported = true,
usePlaceholders = true,
analyses = {
unusedparams = true,
},
},
}
lspconfig.gopls.setup({
on_attach = nvlsp.on_attach,
capabilities = nvlsp.capabilities,
cmd = { "gopls" },
filetypes = { "go", "gomod", "gowork", "gotmpl" },
settings = {
completeUnimported = true,
usePlaceholders = true,
analyses = {
unusedparams = true,
},
},
})
lspconfig.ts_ls.setup {
on_attach = nvlsp.on_attach,
capabilities = nvlsp.capabilities,
init_options = {
preferences = {
disableSuggestions = true,
},
},
}
lspconfig.ts_ls.setup({
on_attach = nvlsp.on_attach,
capabilities = nvlsp.capabilities,
init_options = {
preferences = {
disableSuggestions = true,
},
},
})
lspconfig.tailwindcss.setup {
on_attach = nvlsp.on_attach,
capabilities = nvlsp.capabilities,
}
lspconfig.tailwindcss.setup({
on_attach = nvlsp.on_attach,
capabilities = nvlsp.capabilities,
})
lspconfig.pyright.setup {
on_attach = nvlsp.on_attach,
capabilities = nvlsp.capabilities,
filetypes = { "python" },
}
lspconfig.pyright.setup({
on_attach = nvlsp.on_attach,
capabilities = nvlsp.capabilities,
filetypes = { "python" },
})
lspconfig.eslint.setup {
on_attach = nvlsp.on_attach,
capabilities = nvlsp.capabilities,
}
lspconfig.eslint.setup({
on_attach = nvlsp.on_attach,
capabilities = nvlsp.capabilities,
})
lspconfig.golangcilsp = {
default_config = {
cmd = { "golangci-lint-langserver" },
root_dir = lspconfig.util.root_pattern(".git", "go.mod"),
init_options = {
command = {
"golangci-lint",
"run",
"--output.json.path",
"stdout",
"--show-stats=false",
"--issues-exit-code=1",
},
},
},
default_config = {
cmd = { "golangci-lint-langserver" },
root_dir = lspconfig.util.root_pattern(".git", "go.mod"),
init_options = {
command = {
"golangci-lint",
"run",
"--output.json.path",
"stdout",
"--show-stats=false",
"--issues-exit-code=1",
},
},
},
}
lspconfig.golangci_lint_ls.setup {
filetypes = { "go", "gomod" },
}
lspconfig.golangci_lint_ls.setup({
filetypes = { "go", "gomod" },
})
require("sonarlint").setup({
server = {
cmd = {
"sonarlint-language-server",
-- Ensure that sonarlint-language-server uses stdio channel
"-stdio",
"-analyzers",
vim.fn.expand("$MASON/share/nvim/mason/share/sonarlint-analyzers/sonargo.jar"),
vim.fn.expand("$MASON/share/sonarlint-analyzers/sonarpython.jar"),
vim.fn.expand("$MASON/share/sonarlint-analyzers/sonarjs.jar"),
},
settings = {
sonarlint = {
test = "test",
},
},
},
filetypes = {
"python",
"go",
"javascript",
"typescript",
},
})

13
nvim/.config/nvim/lua/mappings.lua
View File

@@ -1,17 +1,16 @@
require "nvchad.mappings"
require("nvchad.mappings")
local map = vim.keymap.set
local M = {}
map("n", "]g", function ()
vim.diagnostic.goto_next()
map("n", "]g", function()
vim.diagnostic.jump({ count = 1, float = true })
end)
map("n", "[g", function ()
vim.diagnostic.goto_prev()
map("n", "[g", function()
vim.diagnostic.jump({ count = -1, float = true })
end)
map("n", "<leader>ww", function()
vim.diagnostic.open_float()
vim.diagnostic.open_float()
end)

242
nvim/.config/nvim/lua/plugins/init.lua
View File

@@ -1,133 +1,115 @@
return {
{
"stevearc/conform.nvim",
event = "BufWritePre", -- uncomment for format on save
opts = require "configs.conform",
},
{
"stevearc/conform.nvim",
event = "BufWritePre", -- uncomment for format on save
opts = require("configs.conform"),
},
{
"neovim/nvim-lspconfig",
config = function()
require "configs.lspconfig"
end,
},
{
"williamboman/mason.nvim",
opts = {
ensure_installed = {
"typescript-language-server",
"eslint-lsp",
"lua-language-server",
"html-lsp",
"pyright",
"mypy",
"ruff",
"gopls",
"goimports",
"debugpy",
"rust-analyzer",
"codelldb",
"tailwindcss-language-server",
"golangci-lint-langserver",
"sonarlint-language-server",
"lua-language-server",
},
},
},
{ "nvim-neotest/nvim-nio" },
{
"mistricky/codesnap.nvim",
build = "make build_generator",
keys = {
{ "<leader>cc", "<cmd>CodeSnap<cr>", mode = "x", desc = "Save selected code snapshot into clipboard" },
{ "<leader>cs", "<cmd>CodeSnapSave<cr>", mode = "x", desc = "Save selected code snapshot in ~/Pictures" },
},
opts = {
save_path = "~/Pictures",
has_breadcrumbs = false,
bg_theme = "bamboo",
watermark = "",
mac_window_bar = false,
},
},
{
"mfussenegger/nvim-dap",
},
{
"leoluz/nvim-dap-go",
ft = "go",
dependencies = "mfussenegger/nvim-dap",
config = function(_, opts)
require("dap-go").setup(opts)
-- require("core.utils").load_mappings("dap_go")
require("dap.ext.vscode").load_launchjs(nil, {})
end,
},
{
"mfussenegger/nvim-dap-python",
ft = "python",
dependencies = "mfussenegger/nvim-dap",
config = function(_, _)
local path = "~/.local/share/nvim/mason/packages/debugpy/venv/bin/python"
require("dap-python").setup(path)
end,
},
{
"NVChad/nvim-autopairs",
enabled = false,
},
{
"mrcjkb/rustaceanvim",
version = "^5", -- Recommended
lazy = false, -- This plugin is already lazy
},
{
"rust-lang/rust.vim",
ft = "rust",
init = function()
vim.g.rustfmt_autosave = 1
end,
},
{
"saecki/crates.nvim",
ft = { "rust", "toml" },
config = function(_, opts)
local crates = require "crates"
crates.setup(opts)
crates.show()
end,
},
{
"rcarriga/nvim-dap-ui",
init = function()
require("dapui").setup()
vim.fn.sign_define("DapBreakpoint", { text = "🐞" })
vim.fn.sign_define("DapBreakpointRejected", { text = "🐞" })
local dap, dapui = require "dap", require "dapui"
dap.listeners.before.attach.dapui_config = function()
dapui.open()
end
dap.listeners.before.launch.dapui_config = function()
dapui.open()
end
dap.listeners.before.event_terminated.dapui_config = function()
dapui.close()
end
dap.listeners.before.event_exited.dapui_config = function()
dapui.close()
end
end,
},
{
"nvim-treesitter/nvim-treesitter",
opts = {
ensure_installed = {
"vim",
"lua",
"vimdoc",
"html",
"css",
},
},
},
{
"neovim/nvim-lspconfig",
config = function()
require("configs.lspconfig")
end,
},
{ "nvim-neotest/nvim-nio" },
{
"mistricky/codesnap.nvim",
build = "make build_generator",
keys = {
{ "<leader>cc", "<cmd>CodeSnap<cr>", mode = "x", desc = "Save selected code snapshot into clipboard" },
{ "<leader>cs", "<cmd>CodeSnapSave<cr>", mode = "x", desc = "Save selected code snapshot in ~/Pictures" },
},
opts = {
save_path = "~/Pictures",
has_breadcrumbs = false,
bg_theme = "bamboo",
watermark = "",
mac_window_bar = false,
},
},
{
"mfussenegger/nvim-dap",
},
{
"leoluz/nvim-dap-go",
ft = "go",
dependencies = "mfussenegger/nvim-dap",
config = function(_, opts)
require("dap-go").setup(opts)
-- require("core.utils").load_mappings("dap_go")
require("dap.ext.vscode").load_launchjs(nil, {})
end,
},
{
"mfussenegger/nvim-dap-python",
ft = "python",
dependencies = "mfussenegger/nvim-dap",
config = function(_, _)
local path = "~/.local/share/nvim/mason/packages/debugpy/venv/bin/python"
require("dap-python").setup(path)
end,
},
{
"NVChad/nvim-autopairs",
enabled = false,
},
{
"mrcjkb/rustaceanvim",
version = "^5", -- Recommended
lazy = false, -- This plugin is already lazy
},
{
"rust-lang/rust.vim",
ft = "rust",
init = function()
vim.g.rustfmt_autosave = 1
end,
},
{
"saecki/crates.nvim",
ft = { "rust", "toml" },
config = function(_, opts)
local crates = require("crates")
crates.setup(opts)
crates.show()
end,
},
{
"rcarriga/nvim-dap-ui",
init = function()
require("dapui").setup()
vim.fn.sign_define("DapBreakpoint", { text = "🐞" })
vim.fn.sign_define("DapBreakpointRejected", { text = "🐞" })
local dap, dapui = require("dap"), require("dapui")
dap.listeners.before.attach.dapui_config = function()
dapui.open()
end
dap.listeners.before.launch.dapui_config = function()
dapui.open()
end
dap.listeners.before.event_terminated.dapui_config = function()
dapui.close()
end
dap.listeners.before.event_exited.dapui_config = function()
dapui.close()
end
end,
},
{
"nvim-treesitter/nvim-treesitter",
opts = {
ensure_installed = {
"vim",
"lua",
"vimdoc",
"html",
"css",
},
},
{
url = "https://gitlab.com/schrieveslaach/sonarlint.nvim",
dependencies = "neovim/nvim-lspconfig",
ft = { "python", "go", "js", "ts" },
},
},
}