From fb0c89988fffe385c3c849f3cb7da5871483054d Mon Sep 17 00:00:00 2001 From: Alessandro Date: Thu, 5 Sep 2024 11:01:48 +0200 Subject: [PATCH] Update plugin / more keybind / ra launch once --- nvim/lazy-lock.json | 18 ++++++------- nvim/lua/configs/lspconfig.lua | 12 +-------- nvim/lua/mappings.lua | 45 +++++++++++++++++++++++++------ nvim/lua/options.lua | 5 ++-- nvim/lua/plugins/init.lua | 2 +- nvim/lua/plugins/rustaceanvim.lua | 11 ++++++++ 6 files changed, 62 insertions(+), 31 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 5b15d58..9494377 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -2,7 +2,7 @@ "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, "NvChad": { "branch": "v2.5", "commit": "b7a163e232524f1024a59a0a5c6ddf123530085c" }, "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" }, - "base46": { "branch": "v2.5", "commit": "94957a0edf563d63e2ab28f5f21190d0f24e431a" }, + "base46": { "branch": "v2.5", "commit": "5b58434a52f86a9bcc7ee89f8a4da81225b490a9" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, @@ -11,26 +11,26 @@ "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, "crates.nvim": { "branch": "main", "commit": "1c924d5a9ea3496c4e1a02d0d51388ba809f8468" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" }, - "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, + "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" }, - "nvim-lsp-endhints": { "branch": "main", "commit": "4af226bd3fb235e623d4ffcc14372a3d9b75e40b" }, - "nvim-lspconfig": { "branch": "master", "commit": "3ad562700d0615818bf358268ac8914f6ce2b079" }, + "nvim-lsp-endhints": { "branch": "main", "commit": "d04212224fa791936b84061f66c0209e9056721d" }, + "nvim-lspconfig": { "branch": "master", "commit": "bdbc65aadc708ce528efb22bca5f82a7cca6b54d" }, "nvim-tree.lua": { "branch": "master", "commit": "ea55ef12036897fdc4476b115a395d2a34965c82" }, - "nvim-treesitter": { "branch": "master", "commit": "a1573a9135c608e68cb383f752623527be84bdce" }, + "nvim-treesitter": { "branch": "master", "commit": "3826d0c42ac635f560479b5b6ab522f6627a3466" }, "nvim-ufo": { "branch": "main", "commit": "5525f422d48f570262611ae2b6aa562c1c428bc5" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "8f47c3d70286a85940cafe990a64b0eac1033671" }, - "rustaceanvim": { "branch": "master", "commit": "d3a8b145f0b3db4de9a08fcbc604659f52ee4fbc" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "5f73b24aeb94f5274c218955573153c69ce4d1ee" }, + "rustaceanvim": { "branch": "master", "commit": "3fd3e5c187ad7155d8bf1a689fa5b651407ab22e" }, "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, - "ui": { "branch": "v2.5", "commit": "cd474496cdc41c833f6376eaf20e7c357b7a2e35" }, + "ui": { "branch": "v2.5", "commit": "7283d036fd6fc2a3352d373dddeb7b1ac27f453f" }, "which-key.nvim": { "branch": "main", "commit": "bfec3d6bc0a9b0b2cb11644642f78c2c3915eef0" } } diff --git a/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua index acf1ff2..d9651ad 100644 --- a/nvim/lua/configs/lspconfig.lua +++ b/nvim/lua/configs/lspconfig.lua @@ -26,17 +26,7 @@ for _, lsp in ipairs(servers) do } end -lspconfig.rust_analyzer.setup { - settings = { - ["rust-analyzer"] = { - inlayHints = { - parameterHints = { - enable = false, - }, - }, - }, - }, -} + local lombok = vim.fn.stdpath('data') .. '/mason/packages/jdtls/lombok.jar' diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua index d267450..ad9ad99 100644 --- a/nvim/lua/mappings.lua +++ b/nvim/lua/mappings.lua @@ -5,8 +5,7 @@ nomap("n", "x") nomap("n", "cc") nomap("n", "ch") nomap("n", "cm") - - +nomap("n", "v") local map = vim.keymap.set map("n", ";", ":", { desc = "CMD enter command mode" }) @@ -15,18 +14,18 @@ map("i", "jk", "") map("n", "f", "", { desc = "Find" }) map("n", "l", "", { desc = "LSP" }) map("n", "g", "", { desc = "Git" }) +map("n", "t", "", { desc = "Terminal" }) -- General map("n", "q", "confirm q", { desc = "quit" }) +map("n", "h", "noh", { desc = "No Highlight" }) +map("n", ";", "Nvdash", { desc = "Dashboard" }) map("n", "c", function() require("nvchad.tabufline").close_buffer() end, { desc = "buffer close" }) -map( - "n", "rd", " lua require('rainbow-delimiters').toggle() ", - {desc = "Toggle rainbow delimiters"} -) +map("n", "rd", " lua require('rainbow-delimiters').toggle() ", { desc = "Toggle rainbow delimiters" }) -- Lsp map( @@ -35,7 +34,14 @@ map( " lua require('conform').format { lsp_fallback = true }", { desc = "General Format file" } ) - map({ "n", "v" }, "la", vim.lsp.buf.code_action, {desc= "Code action"}) +map({ "n", "v" }, "la", vim.lsp.buf.code_action, { desc = "Code action" }) +map("n", "gD", vim.lsp.buf.declaration, { desc = "Go to declaration" }) +map("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" }) +map("n", "gi", vim.lsp.buf.implementation, { desc = "Go to implementation" }) +map("n", "gr", vim.lsp.buf.references, { desc = "Show references" }) +map("n", "lr", function() + require "nvchad.lsp.renamer"() + end, {desc = "NvRenamer"}) -- Git map("n", "gm", "Telescope git_commits", { desc = "telescope git commits" }) @@ -44,6 +50,29 @@ map({ "n", "t" }, "gg", function() pos = "float", cmd = "gitui && exit", id = "gue", - clear_cmd = true + clear_cmd = true, } end, { desc = "Gitui" }) + +-- term +map({ "n", "t" }, "tr", function() + require("nvchad.term").toggle { pos = "float", id = "floatTerm" } +end, { desc = "Terminal Toggle Floating term" }) +map({ "n", "t" }, "tt", function() + require("nvchad.term").toggle { pos = "sp", id = "hTerm" } +end, { desc = "Terminal Toggle Horizontal term" }) +map({ "n", "t" }, "tg", function() + require("nvchad.term").toggle { pos = "vsp", id = "VTerm" } +end, { desc = "Terminal Toggle Vertical term" }) + + +-- cmp +local cmp = require "cmp" + +cmp.setup { + mapping = { + [""] = cmp.mapping(cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Select }, { "i" }), + [""] = cmp.mapping(cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Select }, { "i" }), + }, +} + diff --git a/nvim/lua/options.lua b/nvim/lua/options.lua index 8a503af..cb6244d 100644 --- a/nvim/lua/options.lua +++ b/nvim/lua/options.lua @@ -7,8 +7,8 @@ require "nvchad.options" vim.lsp.inlay_hint.enable(true) -vim.o.foldcolumn = '0' -- '0' is not bad -vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value +vim.o.foldcolumn = "0" -- '0' is not bad +vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value vim.o.foldlevelstart = 99 vim.o.foldenable = true vim.opt.fillchars = { @@ -22,3 +22,4 @@ vim.opt.fillchars = { foldclose = "", } + diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua index 298ea84..ebfebd0 100644 --- a/nvim/lua/plugins/init.lua +++ b/nvim/lua/plugins/init.lua @@ -27,4 +27,4 @@ return { "nvim-tree/nvim-tree.lua", opts = require "configs.nvim-tree", }, - } +} diff --git a/nvim/lua/plugins/rustaceanvim.lua b/nvim/lua/plugins/rustaceanvim.lua index 0007a8a..3e8f639 100644 --- a/nvim/lua/plugins/rustaceanvim.lua +++ b/nvim/lua/plugins/rustaceanvim.lua @@ -4,6 +4,17 @@ return { lazy = false, -- This plugin is already lazy config = function() vim.g.rustaceanvim = { + server = { + default_settings = { + ["rust-analyzer"] = { + inlayHints = { + parameterHints = { + enable = false, + }, + }, + }, + }, + }, tools = { float_win_config = { border = "rounded",