setting up rust tools again

after/plugin/lsp.lua

@@ -36,7 +36,7 @@ lsp.setup_nvim_cmp({
 })
 
 lsp.set_preferences({
-    suggest_lsp_servers = false,
+  suggest_lsp_servers = true,
   sign_icons = {
     error = 'E',
     warn = 'W',
@@ -62,7 +62,7 @@ lsp.on_attach(function(client, bufnr)
   vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
 end)
 
-lsp.skip_server_setup({'rust_analyzer'})
+lsp.skip_server_setup({ 'rust_analyzer' })
 lsp.setup()
 
 vim.diagnostic.config({
@@ -79,24 +79,17 @@ local rt = require("rust-tools")
 -- Configure LSP through rust-tools.nvim plugin.
 -- rust-tools will configure and enable certain LSP features for us.
 -- See https://github.com/simrat39/rust-tools.nvim#configuration
-local opts = {
+rt.setup({
-  tools = {
-    runnables = {
-      use_telescope = true,
-    },
-    inlay_hints = {
-      auto = true,
-      show_parameter_hints = false,
-      parameter_hints_prefix = "",
-      other_hints_prefix = "",
-    },
-  },
-
-  -- all the opts to send to nvim-lspconfig
-  -- these override the defaults set by rust-tools.nvim
-  -- see https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md#rust_analyzer
   server = {
-    -- on_attach is a callback called when the language server attachs to the buffer
+    on_attach = function(_, bufnr)
+      -- Hover actions
+      vim.keymap.set("n", "K", rt.hover_actions.hover_actions, { buffer = bufnr })
+      -- Code action groups
+      vim.keymap.set("n", "<leader>la", rt.code_action_group.code_action_group, { buffer = bufnr })
+      vim.keymap.set("n", "<leader>lg", vim.diagnostic.open_float, { buffer = bufnr })
+      vim.keymap.set("n", "<leader>lf", vim.lsp.buf.format, { buffer = bufnr })
+    end,
+
     settings = {
       -- to enable rust-analyzer settings visit:
       -- https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/generated_config.adoc
@@ -107,26 +100,10 @@ local opts = {
         },
         cargo = {
           -- to enable include! macro being read
-          loadOutDirsFromCheck = true
+          -- loadOutDirsFromCheck = true,
+          -- buildScripts = true,
         },
       },
     },
   },
-}
+})
-
--- todo: centralize and use the same callback for lspzero and rust-tools
-opts.server.on_attach = function(client, bufnr)
-    local opts = { buffer = bufnr, remap = false }
-
-    vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
-    vim.keymap.set("n", "K", function() rt.hover_actions.hover_actions() end, opts)
-
-    vim.keymap.set("n", "<leader>gl", function() vim.diagnostic.open_float() end, opts)
-
-    vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, opts)
-
-    vim.keymap.set("n", "<leader>lf", function() vim.lsp.buf.format() end, opts)
-    vim.keymap.set("n", "<leader>gr", function() vim.lsp.buf.references() end, opts)
-end
-
-rt.setup(opts)