Fix Conform and rust-analyzer

This commit is contained in:
Vladislav 2024-03-04 03:07:21 +01:00
parent 245105e8f3
commit 46794db36c
No known key found for this signature in database
GPG Key ID: 07A1CCBD643CA257
1 changed files with 26 additions and 13 deletions

View File

@ -232,7 +232,7 @@ require('lazy').setup {
-- require('Comment').setup({}) -- require('Comment').setup({})
-- "gc" to comment visual regions/lines -- "gc" to comment visual regions/lines
{ 'numToStr/Comment.nvim', opts = {} }, { 'numToStr/Comment.nvim', opts = {} },
-- Here is a more advanced example where we pass configuration -- Here is a more advanced example where we pass configuration
-- options to `gitsigns.nvim`. This is equivalent to the following lua: -- options to `gitsigns.nvim`. This is equivalent to the following lua:
@ -267,7 +267,7 @@ require('lazy').setup {
-- after the plugin has been loaded: -- after the plugin has been loaded:
-- config = function() ... end -- config = function() ... end
{ -- Useful plugin to show you pending keybinds. { -- Useful plugin to show you pending keybinds.
'folke/which-key.nvim', 'folke/which-key.nvim',
event = 'VimEnter', -- Sets the loading event to 'VimEnter' event = 'VimEnter', -- Sets the loading event to 'VimEnter'
config = function() -- This is the function that runs, AFTER loading config = function() -- This is the function that runs, AFTER loading
@ -536,8 +536,10 @@ require('lazy').setup {
-- pyright = {}, -- pyright = {},
rust_analyzer = { rust_analyzer = {
settings = { settings = {
check = { ['rust-analyzer'] = {
command = "clippy", check = {
command = 'clippy',
},
}, },
}, },
}, },
@ -611,8 +613,6 @@ require('lazy').setup {
{ -- Autoformat { -- Autoformat
'stevearc/conform.nvim', 'stevearc/conform.nvim',
event = { "BufWritePre" },
cmd = { "ConformInfo" },
opts = { opts = {
notify_on_error = false, notify_on_error = false,
format_on_save = { format_on_save = {
@ -620,12 +620,25 @@ require('lazy').setup {
lsp_fallback = true, lsp_fallback = true,
}, },
formatters_by_ft = { formatters_by_ft = {
lua = { "stylua" }, lua = { 'stylua' },
python = { "isort", "black" }, python = { 'isort', 'black' },
javascript = { { "prettierd", "prettier" } }, javascript = { { 'prettierd', 'prettier' } },
typescript = { { "prettierd", "prettier" } }, typescript = { { 'prettierd', 'prettier' } },
rust = { "rustfmt" }, rust = { 'rustfmt' },
cpp = { "clang-format" }, cpp = { 'clang-format' },
},
},
event = { 'BufWritePre' },
cmd = { 'ConformInfo' },
keys = {
{
-- Customize or remove this keymap to your liking
'<leader>f',
function()
require('conform').format { async = true, lsp_fallback = true }
end,
mode = '',
desc = 'Format buffer',
}, },
}, },
init = function() init = function()
@ -733,7 +746,7 @@ require('lazy').setup {
-- --
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme` -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`
'folke/tokyonight.nvim', 'folke/tokyonight.nvim',
lazy = false, -- make sure we load this during startup if it is your main colorscheme lazy = false, -- make sure we load this during startup if it is your main colorscheme
priority = 1000, -- make sure to load this before all the other start plugins priority = 1000, -- make sure to load this before all the other start plugins
config = function() config = function()
-- Load the colorscheme here -- Load the colorscheme here