diff --git a/highlights/init.lua b/highlights/init.lua index f7e055b..78014f5 100644 --- a/highlights/init.lua +++ b/highlights/init.lua @@ -1,3 +1,4 @@ return { -- this table overrides highlights in all themes -- Normal = { bg = "#000000" }, + inlays = { fg = "#a86280" } } diff --git a/init.lua b/init.lua index b41b90d..2a4f779 100644 --- a/init.lua +++ b/init.lua @@ -1,11 +1,32 @@ return { colorscheme = "material", lsp = { + -- server_registration = function(server, opts) + -- if server == 'rust_analyzer' then + -- require('rust-tools').setup({ server = opts }) + -- return + -- end + -- + -- require('lspconfig')[server].setup(opts) + -- end, formatting = { format_on_save = false }, -- skip_setup = { "rust_analyzer" }, setup_handlers = { -- add custom handler - rust_analyzer = function(_, opts) require("rust-tools").setup { server = opts } end, + rust_analyzer = function(_, opts) + local rt = require "rust-tools" + rt.setup { + server = opts, + tools = { + inlay_hints = { + parameter_hints_prefix = "< ", + other_hints_prefix = ": ", + highlight = "inlays", + }, + }, + } + rt.inlay_hints.enable() + end, }, -- server_registration = function(server, opts) -- if server == "rust_analyzer" then diff --git a/plugins/inlay-hints.lua b/plugins/inlay-hints.lua deleted file mode 100644 index c602f90..0000000 --- a/plugins/inlay-hints.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - -- "simrat39/inlay-hints.nvim", -} diff --git a/plugins/rust-tools.lua b/plugins/rust-tools.lua index f011039..6dcab2c 100644 --- a/plugins/rust-tools.lua +++ b/plugins/rust-tools.lua @@ -1,40 +1,4 @@ return { "simrat39/rust-tools.nvim", - after = { "mason-lspconfig.nvim" }, - config = function() - local rt = require "rust-tools" - rt.setup { - tools = { - runnables = { - use_telescope = true, - }, - inlay_hints = { - auto = true, - show_parameter_hints = true, - parameter_hints_prefix = "asdasd ", - other_hints_prefix = "dddd ", - only_current_line = false, - }, - }, - - -- 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 = on_attach, - -- settings = { - -- -- to enable rust-analyzer settings visit: - -- -- https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/generated_config.adoc - -- ["rust-analyzer"] = { - -- -- enable clippy on save - -- checkOnSave = { - -- command = "clippy", - -- }, - -- }, - -- }, - -- }, - } - rt.inlay_hints.enable() - end, + after = { "mason-lspconfig.nvim", "inlay-hints." }, }