1
0
mirror of https://github.com/tiyn/dotfiles.git synced 2025-10-10 19:41:15 +02:00

nvim: added conform.nvim and updated plugins

This commit is contained in:
2023-10-04 19:12:59 +02:00
parent 529ba57816
commit 0cbe61a255
4 changed files with 46 additions and 29 deletions

View File

@@ -61,16 +61,16 @@ vim.keymap.set('n', '<F2>', ':NvimTreeToggle toggle<CR>', {})
-- numtostr/fterm.nvim
vim.keymap.set({ 'n', 't' }, '<leader>t', require("FTerm").toggle, { noremap = true })
local lazygit = require("FTerm"):new({
cmd = 'lazygit',
cmd = 'lazygit',
})
vim.keymap.set({ 'n', 't' }, '<leader>gt', function() lazygit:toggle() end)
-- sindrets/diffview.nvim
vim.keymap.set( 'n', '<leader>gdo', ":DiffviewOpen<CR>")
vim.keymap.set( 'n', '<leader>gdc', ":DiffviewClose<CR>")
vim.keymap.set('n', '<leader>gdo', ":DiffviewOpen<CR>")
vim.keymap.set('n', '<leader>gdc', ":DiffviewClose<CR>")
-- folke/trouble.nvim
vim.keymap.set( 'n', '<leader>x', ":TroubleToggle<CR>")
vim.keymap.set('n', '<leader>x', ":TroubleToggle<CR>")
-- hrsh7th/nvim-cmp
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { noremap = true })
@@ -79,7 +79,9 @@ vim.keymap.set('n', 'gy', vim.lsp.buf.type_definition, { noremap = true })
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { noremap = true })
vim.keymap.set('n', 'gr', vim.lsp.buf.references, { noremap = true })
vim.keymap.set('n', 'K', vim.lsp.buf.hover, { noremap = true })
vim.keymap.set('n', '<F8>', vim.lsp.buf.format, { noremap = true })
vim.keymap.set('n', '<F8>', function()
require("conform").format({ async = true, lsp_fallback = true })
end, { noremap = true })
-- filipdutescu/renamer.nvim
vim.keymap.set('n', '<F5>', require("renamer").rename, { noremap = true })

View File

@@ -0,0 +1,11 @@
return {
{
'stevearc/conform.nvim',
opts = {
formatters_by_ft = {
python = { "isort", "black" },
markdown = { "mdformat" },
},
}
}
}

View File

@@ -8,7 +8,10 @@ return {
config = function()
require("null-ls").setup({
sources = {
-- python
require("null-ls").builtins.formatting.isort,
require("null-ls").builtins.formatting.black,
-- markdown
require("null-ls").builtins.formatting.mdformat
}
})
@@ -18,7 +21,7 @@ return {
'jay-babu/mason-null-ls.nvim',
opts = {
automatic_installation = true,
ensure_installed = { "black", "mdformat" }
ensure_installed = { "isort", "black", "mdformat" }
}
},