From eaca9e79ed10e75a6dafaad388d5f91c3d36b749 Mon Sep 17 00:00:00 2001 From: 0xTux <0xtux@pm.me> Date: Sun, 17 Mar 2024 10:12:06 +0000 Subject: [PATCH] add rust support --- pkgs/nvchad/nvim/lua/configs/lspconfig.lua | 2 +- pkgs/nvchad/nvim/lua/configs/overrides.lua | 8 ++++++++ pkgs/nvchad/nvim/lua/configs/rustaceanvim.lua | 17 +++++++++++++++++ pkgs/nvchad/nvim/lua/plugins/init.lua | 15 ++++++++++++++- 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 pkgs/nvchad/nvim/lua/configs/rustaceanvim.lua diff --git a/pkgs/nvchad/nvim/lua/configs/lspconfig.lua b/pkgs/nvchad/nvim/lua/configs/lspconfig.lua index 658ef7d..8d8706d 100644 --- a/pkgs/nvchad/nvim/lua/configs/lspconfig.lua +++ b/pkgs/nvchad/nvim/lua/configs/lspconfig.lua @@ -4,7 +4,7 @@ local capabilities = configs.capabilities local lspconfig = require("lspconfig") -local servers = { "tsserver", "tailwindcss", "eslint", "gopls" } +local servers = { "tsserver", "tailwindcss", "eslint", "gopls", "rust_analyzer" } local function organize_imports() local params = { diff --git a/pkgs/nvchad/nvim/lua/configs/overrides.lua b/pkgs/nvchad/nvim/lua/configs/overrides.lua index 91a9614..447fd22 100644 --- a/pkgs/nvchad/nvim/lua/configs/overrides.lua +++ b/pkgs/nvchad/nvim/lua/configs/overrides.lua @@ -21,6 +21,9 @@ M.treesitter = { "gomod", "gowork", "gosum", + + -- rust + "rust", }, } @@ -42,6 +45,11 @@ M.mason = { -- nix "nil", + + -- rust + "rust-analyzer", + "rustfmt", + "codelldb", }, } diff --git a/pkgs/nvchad/nvim/lua/configs/rustaceanvim.lua b/pkgs/nvchad/nvim/lua/configs/rustaceanvim.lua new file mode 100644 index 0000000..52ce836 --- /dev/null +++ b/pkgs/nvchad/nvim/lua/configs/rustaceanvim.lua @@ -0,0 +1,17 @@ +local configs = require("nvchad.configs.lspconfig") +local on_attach = configs.on_attach +local capabilities = configs.capabilities + +vim.g.rustaceanvim = { + server = { + on_attach = on_attach, + capabilities = capabilities, + default_settings = { + ["rust-analyzer"] = { + cargo = { + allFeatures = true, + }, + }, + }, + }, +} diff --git a/pkgs/nvchad/nvim/lua/plugins/init.lua b/pkgs/nvchad/nvim/lua/plugins/init.lua index 63f07a0..e2969ef 100644 --- a/pkgs/nvchad/nvim/lua/plugins/init.lua +++ b/pkgs/nvchad/nvim/lua/plugins/init.lua @@ -98,7 +98,6 @@ local plugins = { dependencies = { "ray-x/guihua.lua", "neovim/nvim-lspconfig", - "nvim-treesitter/nvim-treesitter", "mfussenegger/nvim-dap", "rcarriga/nvim-dap-ui", "theHamsta/nvim-dap-virtual-text", @@ -110,5 +109,19 @@ local plugins = { ft = { "go", "gomod" }, build = ':lua require("go.install").update_all_sync()', }, + { + "mrcjkb/rustaceanvim", + version = "^4", + ft = { "rust" }, + config = function() + require("configs.rustaceanvim") + end, + dependencies = { + "neovim/nvim-lspconfig", + "mfussenegger/nvim-dap", + "rcarriga/nvim-dap-ui", + "theHamsta/nvim-dap-virtual-text", + }, + }, } return plugins