diff --git a/lua/409/plugins/formatting.lua b/lua/409/plugins/formatting.lua index 453cbfa..c1cc0de 100644 --- a/lua/409/plugins/formatting.lua +++ b/lua/409/plugins/formatting.lua @@ -8,7 +8,6 @@ return { c = { "clang_format" }, cs = { "csharpier" }, javascript = { "prettierd" }, - rust = { "rustfmt" }, dart = { "dart_format" }, }, } @@ -21,10 +20,6 @@ return { args = { "--style", "{IndentWidth: 4, UseTab: Always, TabWidth: 4}" }, } - conform.formatters.rustfmt = { - args = { "--edition", "2021" }, - } - vim.keymap.set("n", "f", function() -- pcall(vim.cmd("TailwindSort")) diff --git a/lua/409/plugins/lsp.lua b/lua/409/plugins/lsp.lua index 060e4eb..16d5fdb 100644 --- a/lua/409/plugins/lsp.lua +++ b/lua/409/plugins/lsp.lua @@ -57,7 +57,6 @@ return { ensure_installed = { "tsserver", "eslint", - "rust_analyzer", "lua_ls", "jsonls", "html", @@ -66,6 +65,7 @@ return { "dockerls", "bashls", "marksman", + "rust_analyzer", }, handlers = { function(server_name) @@ -140,6 +140,7 @@ return { "williamboman/mason.nvim", dependencies = {}, opts = { + PATH = "append", ui = { border = "single", }, diff --git a/lua/409/plugins/treesitter.lua b/lua/409/plugins/treesitter.lua index 3555729..04b80cf 100644 --- a/lua/409/plugins/treesitter.lua +++ b/lua/409/plugins/treesitter.lua @@ -12,6 +12,7 @@ return { "vim", "vimdoc", "gitcommit", + "rust", }, tree_docs = { enable = true, @@ -34,7 +35,7 @@ return { }, indent = { enable = true, - disable = { "yaml" }, + disable = { "yaml", "rust" }, }, }) end, diff --git a/lua/409/set.lua b/lua/409/set.lua index 7448ff5..54d0c97 100755 --- a/lua/409/set.lua +++ b/lua/409/set.lua @@ -6,7 +6,7 @@ vim.opt.relativenumber = true vim.opt.tabstop = 4 vim.opt.softtabstop = 4 vim.opt.shiftwidth = 4 -vim.opt.expandtab = true +vim.opt.expandtab = false vim.opt.smartindent = true vim.opt.smartcase = true