cant put lua in vimscript places...

emattiza · Apr 17, 2023 · ee61fc8 · ee61fc8
1 parent bc15a72
commit ee61fc8
Showing 1 changed file with 27 additions and 33 deletions.
diff --git a/modules/lsp/lsp.nix b/modules/lsp/lsp.nix
@@ -93,39 +93,6 @@ in {
           );
 
         configRC = ''
-          ${
-            if cfg.rust.enable
-            then ''
-              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 ""
-          }
-
           ${
             if cfg.nix
             then ''
@@ -360,6 +327,33 @@ in {
                 name = "crates.nvim",
               }
             }
+
+              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)
           ''}
 
           ${writeIf cfg.terraform ''