diff --git a/nvim/after/plugin/lsp.lua b/nvim/after/plugin/lsp.lua index efb53f3..23308bb 100644 --- a/nvim/after/plugin/lsp.lua +++ b/nvim/after/plugin/lsp.lua @@ -1,50 +1,3 @@ -local opts = { - tools = { -- rust-tools options - -- automatically call RustReloadWorkspace when writing to a Cargo.toml file. - reload_workspace_from_cargo_toml = true, - - -- These apply to the default RustSetInlayHints command - inlay_hints = { - -- automatically set inlay hints (type hints) - -- default: true - auto = true, - - -- Only show inlay hints for the current line - only_current_line = false, - - -- whether to show parameter hints with the inlay hints or not - -- default: true - show_parameter_hints = true, - - -- prefix for parameter hints - -- default: "<-" - parameter_hints_prefix = "<- ", - - -- prefix for all the other hints (type, chaining) - -- default: "=>" - other_hints_prefix = "=> ", - - -- whether to align to the length of the longest line in the file - max_len_align = false, - - -- padding from the left if max_len_align is true - max_len_align_padding = 1, - - -- whether to align to the extreme right or not - right_align = false, - - -- padding from the right if right_align is true - right_align_padding = 7, - - -- The color of the hints - highlight = "Comment", - }, - }, -} - -require('rust-tools').setup(opts) - - local lsp = require('lsp-zero') lsp.preset('recommended') @@ -109,5 +62,6 @@ end) lsp.setup() vim.diagnostic.config({ - virtual_text = true + virtual_text = true, + inlay_hints = true }) \ No newline at end of file diff --git a/nvim/after/plugin/rt.lua b/nvim/after/plugin/rt.lua index e69de29..ac4eaa4 100644 --- a/nvim/after/plugin/rt.lua +++ b/nvim/after/plugin/rt.lua @@ -0,0 +1,45 @@ +-- local opts = { +-- tools = { -- rust-tools options +-- -- automatically call RustReloadWorkspace when writing to a Cargo.toml file. +-- reload_workspace_from_cargo_toml = true, + +-- -- These apply to the default RustSetInlayHints command +-- inlay_hints = { +-- -- automatically set inlay hints (type hints) +-- -- default: true +-- auto = true, + +-- -- Only show inlay hints for the current line +-- only_current_line = false, + +-- -- whether to show parameter hints with the inlay hints or not +-- -- default: true +-- show_parameter_hints = true, + +-- -- prefix for parameter hints +-- -- default: "<-" +-- parameter_hints_prefix = "<- ", + +-- -- prefix for all the other hints (type, chaining) +-- -- default: "=>" +-- other_hints_prefix = "=> ", + +-- -- whether to align to the length of the longest line in the file +-- max_len_align = false, + +-- -- padding from the left if max_len_align is true +-- max_len_align_padding = 1, + +-- -- whether to align to the extreme right or not +-- right_align = false, + +-- -- padding from the right if right_align is true +-- right_align_padding = 7, + +-- -- The color of the hints +-- highlight = "Comment", +-- }, +-- }, +-- } + +-- require('rust-tools').setup(opts) diff --git a/nvim/lua/luke-else/packer.lua b/nvim/lua/luke-else/packer.lua index 024c858..0f1b6ed 100644 --- a/nvim/lua/luke-else/packer.lua +++ b/nvim/lua/luke-else/packer.lua @@ -32,10 +32,7 @@ return require('packer').startup(function(use) 'windwp/nvim-autopairs', config = function() require('nvim-autopairs').setup {} end } - - -- Rust tools - use 'simrat39/rust-tools.nvim' - + -- LSP use { 'VonHeikemen/lsp-zero.nvim', @@ -45,7 +42,7 @@ return require('packer').startup(function(use) {'neovim/nvim-lspconfig'}, {'williamboman/mason.nvim'}, {'williamboman/mason-lspconfig.nvim'}, - + -- Autocompletion {'hrsh7th/nvim-cmp'}, {'hrsh7th/cmp-buffer'}, @@ -53,13 +50,16 @@ return require('packer').startup(function(use) {'saadparwaiz1/cmp_luasnip'}, {'hrsh7th/cmp-nvim-lsp'}, {'hrsh7th/cmp-nvim-lua'}, - + -- Snippets {'L3MON4D3/LuaSnip'}, {'rafamadriz/friendly-snippets'}, } } + -- -- Rust tools + -- use 'simrat39/rust-tools.nvim' + -- Debugger use 'nvim-lua/plenary.nvim' use { 'rcarriga/nvim-dap-ui', requires = {'mfussenegger/nvim-dap'} }