diff --git a/lazy-lock.json b/lazy-lock.json index b01ae39..b94e720 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,42 +1,49 @@ { - "NvChad": { "branch": "v2.5", "commit": "f6025f0788880989484733c90deff07dff01ef02" }, - "base46": { "branch": "v2.5", "commit": "177af7c0e492f6332bf78675a47b8983b1a32291" }, - "blink.cmp": { "branch": "main", "commit": "af68874f1b2e628e0c72ec27f5225d0c6b2d6820" }, - "conform.nvim": { "branch": "master", "commit": "f5bd8419f8a29451e20bdb1061a54fe13d5c8de3" }, + "LuaSnip": { "branch": "master", "commit": "787dee55ca364cc9119787165418fe93b74c1842" }, + "NvChad": { "branch": "v2.5", "commit": "09dd13e9c6df98fe5609829a7a0fbccea2f515ae" }, + "actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" }, + "base46": { "branch": "v2.5", "commit": "fec9fa583025e69e0c4f902bd61990e8d13d1975" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "conform.nvim": { "branch": "master", "commit": "5fbea7d7043bae2499d643c97b407f6da44abff4" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, - "fzf-lua": { "branch": "main", "commit": "5dec364c9dedec00dcd6d06e323d7bc7f8d6b596" }, - "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, + "fzf-lua": { "branch": "main", "commit": "fc0f2b5781587d388b743c2c114127a7036d1a31" }, + "gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" }, "hardtime.nvim": { "branch": "main", "commit": "027d6f991927a71bd510a7673ae5bb404ca2a1c7" }, - "hop.nvim": { "branch": "master", "commit": "8f51ef02700bb3cdcce94e92eff16170a6343c4f" }, + "hop.nvim": { "branch": "master", "commit": "08ddca799089ab96a6d1763db0b8adc5320bf050" }, "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, - "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, + "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, "local-highlight.nvim": { "branch": "master", "commit": "ae3ada3a332128b1036c84c8587b9069891c63da" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "menu": { "branch": "main", "commit": "ee85b2e394fde354bd24e35ff7a688d10c9212fa" }, - "mini.pick": { "branch": "main", "commit": "6d66ae9eb0b75261f1842788dda611285b6f065f" }, - "minty": { "branch": "main", "commit": "7c2a6452922313e10ff46aea49a4bb5e50e1ac68" }, - "neogit": { "branch": "master", "commit": "eda716c44d3b5a424ea8604b10756c7fd8bed93a" }, + "mini.pick": { "branch": "main", "commit": "b7ee06ca0b692023d87a17ba855012047c6bec6f" }, + "minty": { "branch": "main", "commit": "157e91c04cce2f01643519338d6b854275a77547" }, + "neogit": { "branch": "master", "commit": "5e51097f964c01bc457f3a0f6fb7287d6782c04e" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, + "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, "nvim-lsp-endhints": { "branch": "main", "commit": "391ef40521b631a8a2fb7aef78db6967ead6b39d" }, - "nvim-lspconfig": { "branch": "master", "commit": "541f3a2781de481bb84883889e4d9f0904250a56" }, + "nvim-lspconfig": { "branch": "master", "commit": "edd9591199d1c78c0cb20514231f7f936f9412a2" }, "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, - "nvim-tree.lua": { "branch": "master", "commit": "f5f67892996b280ae78b1b0a2d07c4fa29ae0905" }, - "nvim-treesitter": { "branch": "master", "commit": "92725df6222614307c4712eb9982e5287f21aa11" }, + "nvim-tree.lua": { "branch": "master", "commit": "2a268f631da85e83b7a95291be589bcddfc785d8" }, + "nvim-treesitter": { "branch": "master", "commit": "377039daa260b71f304c881d1b21d643c501a261" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "0d79d169fcd45a8da464727ac893044728f121d4" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "rustaceanvim": { "branch": "master", "commit": "819c3197bc308d81ea9c8cf75b01f34eb3f0e03b" }, - "statuscol.nvim": { "branch": "main", "commit": "ecc04176e364dd7f614edfc4325e3a8521905ad6" }, + "rustaceanvim": { "branch": "master", "commit": "6eb1c41463a0ad02a4fe799321cc7f651b87e576" }, + "statuscol.nvim": { "branch": "main", "commit": "5998d16044159ad3779f62c45e756c555e3051f0" }, "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" }, "tint.nvim": { "branch": "master", "commit": "02bd0527a315a80e4e25bb2dd7b6994fb0daae01" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, + "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" }, "typescript-tools.nvim": { "branch": "master", "commit": "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7" }, - "ui": { "branch": "v3.0", "commit": "e0891549ec3ccff7d68a57915e7af97c9608ffad" }, + "ui": { "branch": "v3.0", "commit": "785bcbbf84eadcf3a831f9247577969e33c8f2ca" }, "vim-kitty": { "branch": "main", "commit": "9cc594a634308aa3bfaf3da5b5e741da1c0144c1" }, - "volt": { "branch": "main", "commit": "43f72b49037c191eb3cfe26ba7a5574b4bfce226" }, + "volt": { "branch": "main", "commit": "229b4f1bc865c866227dd0e2ecda11ab6ec2c8cc" }, "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } } diff --git a/lua/configs/lspconfig.lua b/lua/configs/lspconfig.lua index 6e8a48c..3cf8a48 100644 --- a/lua/configs/lspconfig.lua +++ b/lua/configs/lspconfig.lua @@ -11,6 +11,9 @@ M.defaults = function() local servers = { "html", "cssls", "lua_ls", "biome", "solidity_ls_nomicfoundation" } vim.lsp.inlay_hint.enable() + vim.lsp.handlers["textDocument/codeAction"] = vim.lsp.with(vim.lsp.handlers.hover, { + border = "rounded", -- You can also use 'single', 'double', 'solid', etc. + }) for _, lsp in ipairs(servers) do lspconfig[lsp].setup { @@ -41,11 +44,16 @@ M.on_attach = function(client, bufnr) require("telescope.builtin").lsp_references() end, opts "LSP References") - map("n", "ga", vim.lsp.buf.code_action, opts "Code Actions") + -- map("n", "ga", function() + -- vim.lsp.buf.code_action { async = true } + -- end, opts "Code Actions") end M.rustacean = { server = { + cmd = function() + return { "/home/naps62/.cargo/bin/ra-multiplex" } + end, on_init = nvlsp.on_init, capabilities = nvlsp.capabilities, on_attach = function(client, bufnr) @@ -55,9 +63,9 @@ M.rustacean = { return { buffer = bufnr, desc = "LSP " .. desc } end - map("n", "ga", function() - vim.cmd.RustLsp "codeAction" - end, opts "Rust Code Actions") + -- map("n", "ga", function() + -- vim.cmd.RustLsp "codeAction" + -- end, opts "Rust Code Actions") end, }, tools = { diff --git a/lua/configs/telescope.lua b/lua/configs/telescope.lua index 7db94a0..f496f92 100644 --- a/lua/configs/telescope.lua +++ b/lua/configs/telescope.lua @@ -35,8 +35,8 @@ local options = { height = 0.80, }, mappings = { - n = { [""] = open_with_trouble, ["t"] = open_with_trouble }, - i = { [""] = open_with_trouble }, + n = { [""] = open_with_trouble, [""] = open_with_trouble }, + i = { [""] = open_with_trouble, [""] = open_with_trouble }, }, }, diff --git a/lua/mappings.lua b/lua/mappings.lua index d06e8a8..5670f02 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -20,7 +20,3 @@ map("i", "", ":update") -- remove search highlight map("n", ",", ":noh") - --- quickfix navigation -map("n", "[q", ":cprev") -map("n", "]q", ":cnext") diff --git a/lua/options.lua b/lua/options.lua index 9327470..94e7120 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -12,3 +12,5 @@ o.relativenumber = true o.showmatch = true o.smartcase = true o.gdefault = true + +o.fillchars = "eob: ,diff: " diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua index 5c9c40a..119c9a0 100644 --- a/lua/plugins/git.lua +++ b/lua/plugins/git.lua @@ -16,4 +16,18 @@ return { { "g", "Neogit", desc = "Neogit" }, }, }, + + { + "sindrets/diffview.nvim", + event = "VeryLazy", + dependencies = "nvim-lua/plenary.nvim", + opts = { + enhanced_diff_hl = true, + file_panel = { + win_config = { + width = 25, + }, + }, + }, + }, } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 86eb984..b7a5998 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -31,4 +31,27 @@ return { event = "LspAttach", opts = {}, -- required, even if empty }, + + { + "aznhe21/actions-preview.nvim", + config = function() + local hl = require "actions-preview.highlight" + require("actions-preview").setup { + backend = { "nui" }, + highlight_command = { hl.delta() }, + + nui = { + keymap = { "q", "" }, + }, + } + end, + keys = { + { + "ga", + function() + require("actions-preview").code_actions() + end, + }, + }, + }, } diff --git a/lua/plugins/theme.lua b/lua/plugins/theme.lua index 4791003..c3021f1 100644 --- a/lua/plugins/theme.lua +++ b/lua/plugins/theme.lua @@ -1,4 +1,19 @@ return { + { + "levouh/tint.nvim", + config = function() + require("tint").setup { + tint = -10, + tint_background_colors = true, + + window_ignore_function = function(winid) + local bufid = vim.api.nvim_win_get_buf(winid) + local buftype = vim.api.nvim_get_option_value("buftype", { buf = bufid }) + return buftype == "nofile" + end, + } + end, + }, -- { "nvchad/base46", enabled = false }, -- { diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua index b5d938e..7682df4 100644 --- a/lua/plugins/trouble.lua +++ b/lua/plugins/trouble.lua @@ -40,6 +40,18 @@ return { "Trouble qflist toggle", desc = "Quickfix List (Trouble)", }, + { + "]q", + function() + require("trouble").next { jump = true } + end, + }, + { + "[q", + function() + require("trouble").prev { jump = true } + end, + }, }, },