This commit is contained in:
Christoph J. Scherr 2024-02-09 15:42:11 +01:00
commit 691a449b30
Signed by: PlexSheep
GPG Key ID: 7CDD0B14851A08EF
2 changed files with 15 additions and 22 deletions

View File

@ -410,7 +410,7 @@ M.edit = {
-- format with conform -- format with conform
["<leader>ff"] = { ["<leader>ff"] = {
function() function()
require("conform").format() vim.lsp.buf.format()
end, end,
"format buffer", "format buffer",
}, },

View File

@ -580,15 +580,12 @@ local plugins = {
local nls = require "null-ls" local nls = require "null-ls"
local builtins = nls.builtins local builtins = nls.builtins
local sources = { local sources = {
builtins.formatting.black, builtins.formatting.djlint.with {
builtins.formatting.fixjson, filetypes = { "django", "jinja.html", "htmldjango", "tera", "html" },
builtins.formatting.golines, },
builtins.formatting.shellharden, builtins.diagnostics.djlint.with {
builtins.formatting.sql_formatter, filetypes = { "django", "jinja.html", "htmldjango", "tera", "html" },
builtins.diagnostics.mypy, },
builtins.diagnostics.vint,
builtins.diagnostics.yamllint,
builtins.code_actions.shellcheck,
builtins.formatting.shfmt, builtins.formatting.shfmt,
builtins.diagnostics.write_good.with { builtins.diagnostics.write_good.with {
diagnostics_postprocess = function(diagnostic) diagnostics_postprocess = function(diagnostic)
@ -804,25 +801,14 @@ local plugins = {
enabled = true, enabled = true,
version = "^4", -- Recommended version = "^4", -- Recommended
ft = { "rust" }, ft = { "rust" },
},
{
"theHamsta/nvim-dap-virtual-text",
lazy = false, -- PERF: this can be done more elegant
config = function() config = function()
require("nvim-dap-virtual-text").setup()
local dap = require "dap" local dap = require "dap"
vim.g.rustaceanvim = { vim.g.rustaceanvim = {
-- Plugin configuration -- Plugin configuration
tools = {}, tools = {},
-- LSP configuration -- LSP configuration
server = { server = {
on_attach = function(client, bufnr) auto_attach = false,
-- you can also put keymaps in here
end,
settings = {
-- rust-analyzer language server configuration
["rust-analyzer"] = {},
},
}, },
-- DAP configuration -- DAP configuration
dap = { dap = {
@ -834,6 +820,13 @@ local plugins = {
} }
end, end,
}, },
{
"theHamsta/nvim-dap-virtual-text",
lazy = false, -- PERF: this can be done more elegant
config = function()
require("nvim-dap-virtual-text").setup()
end,
},
} }
return plugins return plugins