From 4190e0d43d0d032f748b6f0ca545696c0f39f832 Mon Sep 17 00:00:00 2001 From: Hau Nguyen Date: Tue, 26 Mar 2024 01:16:35 +0700 Subject: [PATCH] config(nvim): switch from neoformat to conform.nvim --- data/nvim/init.lua | 49 ++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/data/nvim/init.lua b/data/nvim/init.lua index 90de2d7..b0bdc20 100644 --- a/data/nvim/init.lua +++ b/data/nvim/init.lua @@ -142,6 +142,9 @@ require("lazy").setup({ DiagnosticSignError = color_eva, } end, + integrations = { + treesitter_context = false, + }, }) vim.cmd("colorscheme catppuccin") @@ -414,20 +417,33 @@ require("lazy").setup({ }, -- Programming languages - -- https://github.com/sbdchd/neoformat + -- https://github.com/stevearc/conform.nvim { - "sbdchd/neoformat", - init = function() - vim.g.neoformat_enabled_go = {} - vim.g.neoformat_enabled_javascript = { "denofmt" } - vim.g.neoformat_enabled_json = { "denofmt" } - vim.g.neoformat_enabled_lua = { "stylua" } - vim.g.neoformat_enabled_markdown = { "denofmt" } - vim.g.neoformat_enabled_python = { "ruff" } - vim.g.neoformat_enabled_sh = { "shfmt" } - vim.g.neoformat_enabled_toml = { "taplo" } - vim.g.neoformat_enabled_zsh = { "shfmt" } - vim.g.shfmt_opt = "-ci" + "stevearc/conform.nvim", + config = function() + local conform = require("conform") + conform.setup({ + formatters_by_ft = { + go = { "gofumpt" }, + javascript = { "deno_fmt" }, + json = { "deno_fmt" }, + lua = { "stylua" }, + markdown = { "deno_fmt" }, + python = { "ruff_format" }, + sh = { "shfmt" }, + toml = { "taplo" }, + }, + log_level = vim.log.levels.DEBUG, + formatters = { + gofumpt = { + prepend_args = { "-extra" }, + }, + }, + }) + + vim.keymap.set("n", "f", function() + conform.format() + end) end, }, @@ -512,9 +528,6 @@ require("lazy").setup({ vim.keymap.set("n", "k", vim.lsp.buf.hover, opts) vim.keymap.set("n", "gk", vim.lsp.buf.hover, opts) vim.keymap.set("n", "", vim.lsp.buf.rename, opts) - vim.keymap.set("n", "f", function() - vim.lsp.buf.format({ async = true }) - end, opts) end, }) @@ -536,9 +549,7 @@ require("lazy").setup({ -- https://neovim.io/doc/user/diagnostic.html#diagnostic-api vim.diagnostic.config({ underline = false, - virtual_text = { - prefix = "🏓", - }, + virtual_text = false, }) end, },