From fe59dc3d3c2b2cbde1db183b7c973dcc206b7b0d Mon Sep 17 00:00:00 2001 From: Sean Herman Date: Fri, 31 Jan 2025 08:44:03 -0500 Subject: [PATCH] formatters rework (#6) - Cleanup conform configs - re-enable avante --------- Co-authored-by: Sean Herman --- lazy-lock.json | 37 +++++++++--------- lua/plugins/avante.lua | 9 +++-- lua/plugins/example.lua | 3 +- lua/plugins/format.lua | 84 +++++++++++------------------------------ 4 files changed, 48 insertions(+), 85 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 7f1b49c..7ed6cfc 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,42 +1,43 @@ { - "LazyVim": { "branch": "main", "commit": "2bea40c447b72e54ffb2d5cddc98d7798990796f" }, - "SchemaStore.nvim": { "branch": "main", "commit": "bb52c530698654355bbddb9f0035dc35cea401a5" }, + "LazyVim": { "branch": "main", "commit": "eb8ddea8c9438c34e71db097eb77a44185dd1093" }, + "SchemaStore.nvim": { "branch": "main", "commit": "085d1a9c4f30de56e312931582e80805f0ed3621" }, "avante.nvim": { "branch": "main", "commit": "0a837a4583d66abaf85c9d31f5efad12af87c736" }, "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, + "catppuccin": { "branch": "main", "commit": "4965db2d6155c25db4e8417465fc2703fdf4c2b7" }, "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, "dressing.nvim": { "branch": "master", "commit": "56ef6a969a4990d938c5fed40c370f65e125fc97" }, - "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, + "flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "fzf-lua": { "branch": "main", "commit": "e68d21bf23f27fae4bb395760e3eb10b8768ea2c" }, - "gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" }, - "grug-far.nvim": { "branch": "main", "commit": "635e69adf3a714621bd0a289314bc23c5848babb" }, - "img-clip.nvim": { "branch": "main", "commit": "da61a81872276b75a2971b056da1b849e0c1870b" }, + "fzf-lua": { "branch": "main", "commit": "aaf7604bca38890cb487b29738f8cb02586bc818" }, + "gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" }, + "grug-far.nvim": { "branch": "main", "commit": "2332c3b47a7234b4a230464c33174834102e04b7" }, + "img-clip.nvim": { "branch": "main", "commit": "5ded6f468d633ccfb315905fe8901d6c95ae8f29" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" }, "mini.icons": { "branch": "main", "commit": "910db5df9724d65371182948f921fce23c2c881e" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, - "neo-tree.nvim": { "branch": "main", "commit": "e752d224f914f1ffa18260fecfbfac233d3ca461" }, - "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, + "neo-tree.nvim": { "branch": "main", "commit": "6a4f0a830f2322f187bce6f18a9e6b5b7ba188e3" }, + "noice.nvim": { "branch": "main", "commit": "e3c68a4d2275a01268a52e2931bfccfbfb693d15" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" }, - "nvim-lspconfig": { "branch": "master", "commit": "b4d65bce97795438ab6e1974b3672c17a4865e3c" }, - "nvim-treesitter": { "branch": "master", "commit": "f3d7c0dafcbc86c4d63f765649c884a03bc1360a" }, + "nvim-lspconfig": { "branch": "master", "commit": "ead2fbc4893fdd062e1dd0842679a48bfb7bac5c" }, + "nvim-treesitter": { "branch": "master", "commit": "7e3942ceca9e0c28760f77ac33bc16399146d879" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, + "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "render-markdown.nvim": { "branch": "main", "commit": "ad055861d17afe058bd835e82292e14a64b51b1d" }, - "snacks.nvim": { "branch": "main", "commit": "b96bd540f785c725289f9f15f0147b1b2dac5a35" }, + "render-markdown.nvim": { "branch": "main", "commit": "1ba6fb7998985736ca3480366c9792be05b93ad7" }, + "snacks.nvim": { "branch": "main", "commit": "bcc075386e7b789378737b6850b7c463421bfd46" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "c3ab53c3f544e4a04f2a05d43451fd9bedff51b4" }, - "trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" }, + "tokyonight.nvim": { "branch": "main", "commit": "dca4adba7dc5f09302a00b0e76078d54d82d2658" }, + "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, - "which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" } + "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" } } diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua index 97f5a4e..a45f08f 100644 --- a/lua/plugins/avante.lua +++ b/lua/plugins/avante.lua @@ -1,3 +1,7 @@ +local enabled = true +-- stylua: ignore +if not enabled then return {} end + return { "yetone/avante.nvim", event = "VeryLazy", @@ -12,7 +16,7 @@ return { "MunifTanjim/nui.nvim", --- The below dependencies are optional, -- "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions - -- "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons + "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons -- "zbirenbaum/copilot.lua", -- for providers='copilot' { -- support for image pasting @@ -85,9 +89,6 @@ return { api_key_name = "", endpoint = "http://127.0.0.1:11434/v1", model = "codellama:7b", - -- temperature = 0.2, - -- context_length = 4096, - -- stop_tokens = { "", "<|endoftext|>" }, }, } end diff --git a/lua/plugins/example.lua b/lua/plugins/example.lua index 17f53d6..8571928 100644 --- a/lua/plugins/example.lua +++ b/lua/plugins/example.lua @@ -1,6 +1,7 @@ -- since this is just an example spec, don't actually load anything here and return an empty spec +local enabled = false -- stylua: ignore -if true then return {} end +if not enabled then return {} end -- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim -- diff --git a/lua/plugins/format.lua b/lua/plugins/format.lua index ee4305b..cf0e745 100644 --- a/lua/plugins/format.lua +++ b/lua/plugins/format.lua @@ -1,68 +1,28 @@ +local enabled = false +-- stylua: ignore +if not enabled then return {} end + return { { "stevearc/conform.nvim", - event = { "BufWritePre" }, - cmd = { "ConformInfo" }, - opts = { - formatters_by_ft = { - nix = { "nixpkgs-fmt" }, - lua = { "stylua" }, - javascript = { { "prettierd" } }, - javascriptreact = { { "prettierd" } }, - typescript = { { "prettierd" } }, - typescriptreact = { { "prettierd" } }, - json = { "prettierd" }, - jsonc = { "prettierd" }, - yaml = { "prettierd" }, - markdown = { "prettierd" }, - ["markdown.mdx"] = { "prettierd" }, - css = { "prettierd" }, - scss = { "prettierd" }, - html = { "prettierd" }, - }, - -- Configure formatters - formatters = { - eslint_d = { - -- Only run eslint if we find a config file in the project - condition = function(ctx) - return vim.fs.find({ - ".eslintrc.js", - ".eslintrc.cjs", - ".eslintrc.yaml", - ".eslintrc.yml", - ".eslintrc.json", - "eslint.config.js", - "package.json", - }, { path = ctx.filename, upward = true })[1] ~= nil - end, + opts = function() + return { + formatters_by_ft = { + nix = { "nixfmt" }, + lua = { "stylua" }, + javascript = { "prettierd" }, + javascriptreact = { "prettierd" }, + typescript = { "prettierd" }, + typescriptreact = { "prettierd" }, + json = { "jq" }, + jsonc = { "jq" }, + yaml = { "yamlfix" }, + markdown = { "markdownlint" }, + ["markdown.mdx"] = { "markdownlint" }, + python = { "black", "isort" }, }, - ["nixpkgs-fmt"] = { - command = "nixpkgs-fmt", - stdin = true, - }, - prettierd = { - -- This tells conform to only run prettier when it finds a config file - condition = function(ctx) - return vim.fs.find({ - ".prettierrc", - ".prettierrc.js", - ".prettierrc.json", - ".prettierrc.yml", - ".prettierrc.yaml", - ".prettierrc.json5", - ".prettierrc.cjs", - "prettier.config.js", - "prettier.config.cjs", - "prettier.config.mjs", - "package.json", - }, { path = ctx.filename, upward = true })[1] ~= nil - end, - }, - stylua = { - command = "stylua", - args = { "--search-parent-directories", "--stdin-filepath", "$FILENAME", "-" }, - }, - }, - }, + formatters = {}, + } + end, }, }