Merge branch 'master' of https://git.cscherr.de/PlexSheep/neovim-confs
This commit is contained in:
commit
691a449b30
|
@ -410,7 +410,7 @@ M.edit = {
|
|||
-- format with conform
|
||||
["<leader>ff"] = {
|
||||
function()
|
||||
require("conform").format()
|
||||
vim.lsp.buf.format()
|
||||
end,
|
||||
"format buffer",
|
||||
},
|
||||
|
|
|
@ -580,15 +580,12 @@ local plugins = {
|
|||
local nls = require "null-ls"
|
||||
local builtins = nls.builtins
|
||||
local sources = {
|
||||
builtins.formatting.black,
|
||||
builtins.formatting.fixjson,
|
||||
builtins.formatting.golines,
|
||||
builtins.formatting.shellharden,
|
||||
builtins.formatting.sql_formatter,
|
||||
builtins.diagnostics.mypy,
|
||||
builtins.diagnostics.vint,
|
||||
builtins.diagnostics.yamllint,
|
||||
builtins.code_actions.shellcheck,
|
||||
builtins.formatting.djlint.with {
|
||||
filetypes = { "django", "jinja.html", "htmldjango", "tera", "html" },
|
||||
},
|
||||
builtins.diagnostics.djlint.with {
|
||||
filetypes = { "django", "jinja.html", "htmldjango", "tera", "html" },
|
||||
},
|
||||
builtins.formatting.shfmt,
|
||||
builtins.diagnostics.write_good.with {
|
||||
diagnostics_postprocess = function(diagnostic)
|
||||
|
@ -804,25 +801,14 @@ local plugins = {
|
|||
enabled = true,
|
||||
version = "^4", -- Recommended
|
||||
ft = { "rust" },
|
||||
},
|
||||
{
|
||||
"theHamsta/nvim-dap-virtual-text",
|
||||
lazy = false, -- PERF: this can be done more elegant
|
||||
config = function()
|
||||
require("nvim-dap-virtual-text").setup()
|
||||
local dap = require "dap"
|
||||
vim.g.rustaceanvim = {
|
||||
-- Plugin configuration
|
||||
tools = {},
|
||||
-- LSP configuration
|
||||
server = {
|
||||
on_attach = function(client, bufnr)
|
||||
-- you can also put keymaps in here
|
||||
end,
|
||||
settings = {
|
||||
-- rust-analyzer language server configuration
|
||||
["rust-analyzer"] = {},
|
||||
},
|
||||
auto_attach = false,
|
||||
},
|
||||
-- DAP configuration
|
||||
dap = {
|
||||
|
@ -834,6 +820,13 @@ local plugins = {
|
|||
}
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue