reconfigure rust-tools

emattiza · Apr 17, 2023 · bc15a72 · bc15a72
1 parent fea0b4f
commit bc15a72
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 39 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -256,10 +256,6 @@
       url = "github:Eandrju/cellular-automaton.nvim";
       flake = false;
     };
-    conjure = {
-      url = "github:Olical/conjure";
-      flake = false;
-    };
   };
 
   outputs = {
@@ -319,7 +315,6 @@
         "purescript-vim"
         "dhall-vim"
         "cellular-automaton"
-        "conjure"
       ];
 
       pluginOverlay = lib.buildPluginOverlay;
@@ -432,9 +427,6 @@
           enable = true;
           coverage.enable = true;
         };
-        vim.conjure = {
-          enable = true;
-        };
       };
     in rec {
       apps = rec {

diff --git a/modules/lsp/lsp.nix b/modules/lsp/lsp.nix
@@ -96,19 +96,32 @@ in {
           ${
             if cfg.rust.enable
             then ''
-              function! MapRustTools()
-                nnoremap <silent><leader>ri <cmd>lua require('rust-tools.inlay_hints').toggle_inlay_hints()<CR>
-                nnoremap <silent><leader>rr <cmd>lua require('rust-tools.runnables').runnables()<CR>
-                nnoremap <silent><leader>re <cmd>lua require('rust-tools.expand_macro').expand_macro()<CR>
-                nnoremap <silent><leader>rc <cmd>lua require('rust-tools.open_cargo_toml').open_cargo_toml()<CR>
-                nnoremap <silent><leader>rg <cmd>lua require('rust-tools.crate_graph').view_crate_graph('x11', nil)<CR>
-              endfunction
-
-              autocmd filetype rust nnoremap <silent><leader>ri <cmd>lua require('rust-tools.inlay_hints').toggle_inlay_hints()<CR>
-              autocmd filetype rust nnoremap <silent><leader>rr <cmd>lua require('rust-tools.runnables').runnables()<CR>
-              autocmd filetype rust nnoremap <silent><leader>re <cmd>lua require('rust-tools.expand_macro').expand_macro()<CR>
-              autocmd filetype rust nnoremap <silent><leader>rc <cmd>lua require('rust-tools.open_cargo_toml').open_cargo_toml()<CR>
-              autocmd filetype rust nnoremap <silent><leader>rg <cmd>lua require('rust-tools.crate_graph').view_crate_graph('x11', nil)<CR>
+              local rt = require('rust-tools')
+              rust_on_attach = function(client, bufnr)
+                default_on_attach(client, bufnr)
+                local opts = { noremap=true, silent=true, buffer = bufnr }
+                vim.keymap.set("n", "<leader>ris", rt.inlay_hints.set, opts)
+                vim.keymap.set("n", "<leader>riu", rt.inlay_hints.unset, opts)
+                vim.keymap.set("n", "<leader>rr", rt.runnables.runnables, opts)
+                vim.keymap.set("n", "<leader>rp", rt.parent_module.parent_module, opts)
+                vim.keymap.set("n", "<leader>rm", rt.expand_macro.expand_macro, opts)
+                vim.keymap.set("n", "<leader>rc", rt.open_cargo_toml.open_cargo_toml, opts)
+                vim.keymap.set("n", "<leader>rg", function() rt.crate_graph.view_crate_graph("x11", nil) end, opts)
+              end
+              local rustopts = {
+                tools = {
+                  autoSetHints = true,
+                  hover_with_actions = false,
+                  inlay_hints = {
+                    only_current_line = false,
+                  }
+                },
+                server = {
+                  capabilities = capabilities,
+                  on_attach = rust_on_attach,
+                }
+              }
+              rt.setup(rustopts)
             ''
             else ""
           }
@@ -347,7 +360,6 @@ in {
                 name = "crates.nvim",
               }
             }
-            require('rust-tools').setup(rustopts)
           ''}
 
           ${writeIf cfg.terraform ''