fix: rust indents

This commit is contained in:
2024-07-31 15:47:13 +02:00
parent c5fae2fa06
commit fd3b5b54ef
4 changed files with 5 additions and 8 deletions

View File

@@ -8,7 +8,6 @@ return {
c = { "clang_format" }, c = { "clang_format" },
cs = { "csharpier" }, cs = { "csharpier" },
javascript = { "prettierd" }, javascript = { "prettierd" },
rust = { "rustfmt" },
dart = { "dart_format" }, dart = { "dart_format" },
}, },
} }
@@ -21,10 +20,6 @@ return {
args = { "--style", "{IndentWidth: 4, UseTab: Always, TabWidth: 4}" }, args = { "--style", "{IndentWidth: 4, UseTab: Always, TabWidth: 4}" },
} }
conform.formatters.rustfmt = {
args = { "--edition", "2021" },
}
vim.keymap.set("n", "<leader>f", function() vim.keymap.set("n", "<leader>f", function()
-- pcall(vim.cmd("TailwindSort")) -- pcall(vim.cmd("TailwindSort"))

View File

@@ -57,7 +57,6 @@ return {
ensure_installed = { ensure_installed = {
"tsserver", "tsserver",
"eslint", "eslint",
"rust_analyzer",
"lua_ls", "lua_ls",
"jsonls", "jsonls",
"html", "html",
@@ -66,6 +65,7 @@ return {
"dockerls", "dockerls",
"bashls", "bashls",
"marksman", "marksman",
"rust_analyzer",
}, },
handlers = { handlers = {
function(server_name) function(server_name)
@@ -140,6 +140,7 @@ return {
"williamboman/mason.nvim", "williamboman/mason.nvim",
dependencies = {}, dependencies = {},
opts = { opts = {
PATH = "append",
ui = { ui = {
border = "single", border = "single",
}, },

View File

@@ -12,6 +12,7 @@ return {
"vim", "vim",
"vimdoc", "vimdoc",
"gitcommit", "gitcommit",
"rust",
}, },
tree_docs = { tree_docs = {
enable = true, enable = true,
@@ -34,7 +35,7 @@ return {
}, },
indent = { indent = {
enable = true, enable = true,
disable = { "yaml" }, disable = { "yaml", "rust" },
}, },
}) })
end, end,

View File

@@ -6,7 +6,7 @@ vim.opt.relativenumber = true
vim.opt.tabstop = 4 vim.opt.tabstop = 4
vim.opt.softtabstop = 4 vim.opt.softtabstop = 4
vim.opt.shiftwidth = 4 vim.opt.shiftwidth = 4
vim.opt.expandtab = true vim.opt.expandtab = false
vim.opt.smartindent = true vim.opt.smartindent = true
vim.opt.smartcase = true vim.opt.smartcase = true