From 74716cf6f5c207e2ce1a1a2f3ea0e6b353751175 Mon Sep 17 00:00:00 2001 From: Daryl Ronningen Date: Tue, 26 Jul 2022 12:43:15 -0700 Subject: [PATCH] initial rust programming --- lua/user/cmp.lua | 4 ++-- lua/user/lsp/mason.lua | 1 + lua/user/lsp/nullls.lua | 1 + lua/user/lsp/settings/taplo.lua | 6 ++++++ lua/user/plugins.lua | 18 ++++++++++++++++++ 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 lua/user/lsp/settings/taplo.lua diff --git a/lua/user/cmp.lua b/lua/user/cmp.lua index 5fc733d..37b6cac 100644 --- a/lua/user/cmp.lua +++ b/lua/user/cmp.lua @@ -82,8 +82,8 @@ cmp.setup({ before = function(entry, vim_item) vim_item.menu = ({ nvim_lsp = "[LSP]", - copilot = "[COPILOT]", npm = "[NPM]", + crates = "[CRATES]", nvim_lua = "[NVIM_LUA]", luasnip = "[SNIPPET]", buffer = "[BUFFER]", @@ -94,9 +94,9 @@ cmp.setup({ }), }, sources = { - { name = "copilot" }, { name = "nvim_lsp" }, { name = "npm" }, + { name = "crates" }, { name = "nvim_lua" }, { name = "luasnip" }, { name = "buffer" }, diff --git a/lua/user/lsp/mason.lua b/lua/user/lsp/mason.lua index 5562f1e..d62a32a 100644 --- a/lua/user/lsp/mason.lua +++ b/lua/user/lsp/mason.lua @@ -22,3 +22,4 @@ require("user.lsp.settings.yamlls") require("user.lsp.settings.volar") require("user.lsp.settings.dockerls") require("user.lsp.settings.rnix") +require("user.lsp.settings.taplo") diff --git a/lua/user/lsp/nullls.lua b/lua/user/lsp/nullls.lua index 6525503..b7f496e 100644 --- a/lua/user/lsp/nullls.lua +++ b/lua/user/lsp/nullls.lua @@ -17,6 +17,7 @@ null_ls.setup({ diagnostics.markdownlint, formatting.markdownlint, diagnostics.yamllint, + formatting.rustfmt, }, on_attach = function(client) if client.server_capabilities.documentFormattingProvider then diff --git a/lua/user/lsp/settings/taplo.lua b/lua/user/lsp/settings/taplo.lua new file mode 100644 index 0000000..00691f9 --- /dev/null +++ b/lua/user/lsp/settings/taplo.lua @@ -0,0 +1,6 @@ +local status_ok, lspconfig = pcall(require, "lspconfig") +if not status_ok then + return +end + +lspconfig.taplo.setup({}) diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 5841a24..8f45902 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -91,6 +91,24 @@ return packer.startup(function(use) use("SmiteshP/nvim-navic") use("kevinhwang91/nvim-ufo") + -- Rust Dev + use({ + "simrat39/rust-tools.nvim", + config = function() + require("rust-tools").setup({}) + end, + }) + use({ + "saecki/crates.nvim", + config = function() + require("crates").setup({ + null_ls = { + enabled = true, + }, + }) + end, + }) + -- Telescope use("nvim-telescope/telescope.nvim") use({ "nvim-telescope/telescope-fzf-native.nvim", run = "make" })