From 0d028910ce7f9bd0d89862705c423f044fe971f0 Mon Sep 17 00:00:00 2001 From: 409 Date: Thu, 8 Feb 2024 14:54:22 +0100 Subject: [PATCH] added conform --- after/plugin/conform.lua | 22 ++++++++++++++++++++++ lua/409/packer.lua | 4 ++++ lua/409/remap.lua | 1 - plugin/packer_compiled.lua | 5 +++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 after/plugin/conform.lua diff --git a/after/plugin/conform.lua b/after/plugin/conform.lua new file mode 100644 index 0000000..377e186 --- /dev/null +++ b/after/plugin/conform.lua @@ -0,0 +1,22 @@ +local conform = require("conform") +conform.setup({ + formatters_by_ft = { + lua = { "stylua" }, + c = { "clang_format" }, + cs = { "csharpier" }, + javascript = { { "prettierd", "prettier" } }, + rust = { "rustfmt" }, + }, +}) + +conform.formatters.clang_format = { + args = { "--style", "{IndentWidth: 4, UseTab: Always, TabWidth: 4}" }, +} + +conform.formatters.rustfmt = { + args = { "--edition", "2021" }, +} + +vim.keymap.set("n", "f", function() + conform.format({ bufnr = vim.lsp.bufnr }) +end) diff --git a/lua/409/packer.lua b/lua/409/packer.lua index 530835d..d52b502 100755 --- a/lua/409/packer.lua +++ b/lua/409/packer.lua @@ -72,4 +72,8 @@ return require('packer').startup(function(use) 'folke/trouble.nvim', dependencies = { 'nvim-tree/nvim-web-devicons' } } + + use({ + 'stevearc/conform.nvim' + }) end) diff --git a/lua/409/remap.lua b/lua/409/remap.lua index d3c85af..75bbcad 100755 --- a/lua/409/remap.lua +++ b/lua/409/remap.lua @@ -24,7 +24,6 @@ vim.keymap.set("i", "", "") vim.keymap.set("n", "Q", "") vim.keymap.set("n", "", "silent !tmux neww tmux-sessionizer") -vim.keymap.set("n", "f", vim.lsp.buf.format) -- vim.keymap.set("n", "", "cnextzz") -- vim.keymap.set("n", "", "cprevzz") diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index 6e0c0e4..d2e93f4 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -114,6 +114,11 @@ _G.packer_plugins = { path = "/home/j409/.local/share/nvim/site/pack/packer/start/cmp-path", url = "https://github.com/hrsh7th/cmp-path" }, + ["conform.nvim"] = { + loaded = true, + path = "/home/j409/.local/share/nvim/site/pack/packer/start/conform.nvim", + url = "https://github.com/stevearc/conform.nvim" + }, harpoon = { loaded = true, path = "/home/j409/.local/share/nvim/site/pack/packer/start/harpoon",