From 0636a4b90a3398890b1b1c523e55e74127dd086d Mon Sep 17 00:00:00 2001 From: Andy Teijelo Date: Sun, 7 Jul 2024 16:31:55 -0400 Subject: [PATCH] give noice another try --- init.lua | 5 +++ lazy-lock.json | 83 ++++++++++++++++++++-------------------- lua/config/keymaps.lua | 2 + lua/plugins/crates.lua | 8 ++++ lua/plugins/disabled.lua | 3 +- lua/plugins/fidget.lua | 2 +- lua/plugins/lsp.lua | 34 ++++++++-------- lua/plugins/noice.lua | 29 ++++++++++++++ 8 files changed, 107 insertions(+), 59 deletions(-) create mode 100644 lua/plugins/crates.lua create mode 100644 lua/plugins/noice.lua diff --git a/init.lua b/init.lua index 2514f9e..cec697b 100644 --- a/init.lua +++ b/init.lua @@ -1,2 +1,7 @@ +-- nvim-linux64/share/nvim/runtime/lua/vim/lsp.lua:354 is setting this keymap +-- before my LazyVim keymap.lua, and then it takes priority over my own keymap; +-- setting it to anything here prevents that from happening. +vim.keymap.set("n", "K", function () end) + -- bootstrap lazy.nvim, LazyVim and your plugins require("config.lazy") diff --git a/lazy-lock.json b/lazy-lock.json index 56c3bc5..8d04728 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,63 +1,64 @@ { - "LazyVim": { "branch": "main", "commit": "dde4a9dcdf49719c67642d09847dbaf7f9c7a156" }, - "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, - "SchemaStore.nvim": { "branch": "main", "commit": "3c488759f57090e0271282a80c9ec7cb86467310" }, - "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, - "catppuccin": { "branch": "main", "commit": "67565cd353fa543fa30cb738570c2e4c87da3e9c" }, + "LazyVim": { "branch": "main", "commit": "6202dd164466250b5c188918b34b3e8a3fec2604" }, + "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "SchemaStore.nvim": { "branch": "main", "commit": "a1be387e7c5d5f4f503515b170b79626a0644b4a" }, + "bufferline.nvim": { "branch": "main", "commit": "81820cac7c85e51e4cf179f8a66d13dbf7b032d9" }, + "catppuccin": { "branch": "main", "commit": "1d76b57bb22069a6477030edd68b52f3b07a9e48" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "conform.nvim": { "branch": "master", "commit": "9a06e83527407a7600a2fe4e0d10adf432b6215e" }, - "crates.nvim": { "branch": "main", "commit": "eecd13449945ee2c064e00c618dfec9b2d856ea3" }, + "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, + "crates.nvim": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" }, "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" }, - "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, - "gitsigns.nvim": { "branch": "main", "commit": "8df63f2ddc615feb71fd4aee45a4cee022876df1" }, - "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" }, - "lazydev.nvim": { "branch": "main", "commit": "6184ebbbc8045d70077659b7d30c705a588dc62f" }, + "gitsigns.nvim": { "branch": "main", "commit": "220446c8c86a280180d852efac60991eaf1a21d4" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "lazy.nvim": { "branch": "main", "commit": "89b264ac1d3c9752b22d4e61d16dc408a75d2a16" }, + "lazydev.nvim": { "branch": "main", "commit": "cea5d0fb556cdc35122d9cae772e7e0ed65b4505" }, "lsp_signature.nvim": { "branch": "master", "commit": "a38da0a61c172bb59e34befc12efe48359884793" }, - "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "lualine.nvim": { "branch": "master", "commit": "e20896769ca3cd7e623f0d9f0f68c2155e1eeee2" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "f5425eb1d0d794f0305d5eeebddabb74614683ff" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, - "mini.ai": { "branch": "main", "commit": "9fef1097bca44616133cde6a6769e7aa07d12d7d" }, - "mini.indentscope": { "branch": "main", "commit": "f0d7faa064c892b96997810afcddfadc3f2a15b3" }, - "mini.nvim": { "branch": "main", "commit": "a3f274633a57c713160baf51724ecfc051117877" }, - "mini.surround": { "branch": "main", "commit": "c40ac9c0060467a82430fab12d30395c5768b5e4" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, + "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" }, + "mini.icons": { "branch": "main", "commit": "6fc6877d58635a13efca456cb025f1dfbf59786d" }, + "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, + "mini.nvim": { "branch": "main", "commit": "12d275f4c3aeddfa12a758a69aff65090613ca34" }, + "mini.surround": { "branch": "main", "commit": "7098744c8d4573a4b32cb172965f6b2ba03465d2" }, + "neo-tree.nvim": { "branch": "v2.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, + "noice.nvim": { "branch": "main", "commit": "04ff1defa257db569a687ec16051a27fbaeb0e2f" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, - "nvim-dap-python": { "branch": "master", "commit": "ae0225d0d4a46e18e6057ab3701ef87bbbd6aaad" }, + "nvim-dap-python": { "branch": "master", "commit": "d777c2b32ed39f61209c09bede28d7491621a631" }, "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" }, - "nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" }, - "nvim-lspconfig": { "branch": "master", "commit": "f43135c38a37c588053ad5e209c7460f43f6340c" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" }, + "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, + "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, "nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-snippets": { "branch": "main", "commit": "5c978b3ba0c504dc9f94ca93d17029f26064d229" }, - "nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" }, - "nvim-treesitter": { "branch": "master", "commit": "b967bbc27b564001c3d3b8ea93444cf6d0b21d23" }, - "nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" }, + "nvim-spectre": { "branch": "master", "commit": "49fae98ef2bfa8342522b337892992e3495065d5" }, + "nvim-treesitter": { "branch": "master", "commit": "64f6f0ab4e3f613aa682eb5fe29c5025db500ddd" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f56a1430f21334868a86eb980b12e0af55690e98" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, - "nvim-ts-autotag": { "branch": "main", "commit": "06fe07d7523ba8c755fac7c913fceba43b1720ee" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, - "persistence.nvim": { "branch": "main", "commit": "95d03ad5450389ad7dc2a0fab14ebb3d46bc2c96" }, + "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, + "persistence.nvim": { "branch": "main", "commit": "a93748acdb2e7bc4389b3738b4c787b764c3b2a6" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "repolink.nvim": { "branch": "master", "commit": "55edfedbaef3e894d2ab5107ea7fadc64cb8258d" }, - "rustaceanvim": { "branch": "master", "commit": "d6d7620b66d74b3b16defcf85cbef7b3582795b3" }, + "rustaceanvim": { "branch": "master", "commit": "f16c6eacfb7556c69ffc229e220b8555378245f0" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, - "telescope-terraform-doc.nvim": { "branch": "main", "commit": "7272e5339f88af036887085d784504092a1ff5fd" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "telescope-terraform-doc.nvim": { "branch": "main", "commit": "7ac642765615e6ff164ecfc82eb278aa68d06840" }, "telescope-terraform.nvim": { "branch": "main", "commit": "072c97023797ca1a874668aaa6ae0b74425335df" }, - "telescope.nvim": { "branch": "master", "commit": "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed" }, - "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, - "tokyonight.nvim": { "branch": "main", "commit": "81c867c5f638597a82c82094dcb90ed42444dabc" }, - "trouble.nvim": { "branch": "main", "commit": "2d8610a07033f2b367e71230ab128f8b89c2639d" }, - "ts-comments.nvim": { "branch": "main", "commit": "c075b4ee00f6e111b44bf99a8cfd5a4cfce9258a" }, - "venv-selector.nvim": { "branch": "regexp", "commit": "d946b1e86212f38ff9c42e3b622a8178bbc93461" }, + "telescope.nvim": { "branch": "master", "commit": "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a" }, + "todo-comments.nvim": { "branch": "main", "commit": "74abcc81254feee74aa129c0a219750686ebcefd" }, + "tokyonight.nvim": { "branch": "main", "commit": "9714c1143287ecb9ca895a7eef0df7b67e8abcb3" }, + "trouble.nvim": { "branch": "main", "commit": "4453fea6bb597830fbd58d2c484612f37b97bd8c" }, + "ts-comments.nvim": { "branch": "main", "commit": "c1f3168f90c8442eec2f62e572ac86b25ca854ff" }, + "venv-selector.nvim": { "branch": "regexp", "commit": "9cbb76e10abed4fff32d015472e7996fd999c996" }, "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" }, - "vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" }, - "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" } + "vim-visual-multi": { "branch": "master", "commit": "38b0e8d94a5499ccc17d6159763d32c79f53417b" }, + "which-key.nvim": { "branch": "main", "commit": "af4ded85542d40e190014c732fa051bdbf88be3d" } } \ No newline at end of file diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index 745704c..05e76c9 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -112,3 +112,5 @@ keymap("n", "", "DapContinue") keymap("n", "", "DapStepOver") keymap("n", "", "DapStepInto") keymap("n", "", "DapStepOut") + +vim.keymap.set("n", "K", require("noice.lsp").hover, { noremap = true, silent = true }) diff --git a/lua/plugins/crates.lua b/lua/plugins/crates.lua new file mode 100644 index 0000000..686f3cd --- /dev/null +++ b/lua/plugins/crates.lua @@ -0,0 +1,8 @@ +return { + "Saecki/crates.nvim", + opts = { + popup = { + border = "rounded" + } + } +} diff --git a/lua/plugins/disabled.lua b/lua/plugins/disabled.lua index a069d0a..e8a1caa 100644 --- a/lua/plugins/disabled.lua +++ b/lua/plugins/disabled.lua @@ -4,10 +4,9 @@ return { { "echasnovski/mini.bufremove", enabled = false }, { "folke/edgy.nvim", enabled = false }, { "folke/flash.nvim", enabled = false }, - { "rcarriga/nvim-notify", enabled = false }, + -- { "rcarriga/nvim-notify", enabled = false }, { "goolord/alpha-nvim", enabled = false }, { "ggandor/leap.nvim", enabled = false }, { "ggandor/flit.nvim", enabled = false }, { "nvimdev/dashboard-nvim", enabled = false }, - { "folke/noice.nvim", enabled = false }, } diff --git a/lua/plugins/fidget.lua b/lua/plugins/fidget.lua index abddb1e..7805bf5 100644 --- a/lua/plugins/fidget.lua +++ b/lua/plugins/fidget.lua @@ -2,7 +2,7 @@ return { { "j-hui/fidget.nvim", tag = 'legacy', - enabled = true, + enabled = false, init = function() require("fidget").setup() end, diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 7004119..8e14e99 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -9,18 +9,22 @@ return { local keys = require("lazyvim.plugins.lsp.keymaps").get() keys[#keys + 1] = { "lf", format, desc = "Format Document", has = "documentFormatting" } keys[#keys + 1] = { "lf", format, desc = "Format Range", mode = "v", has = "documentRangeFormatting" } - vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "rounded" }) - vim.lsp.handlers["textDocument/signatureHelp"] = - vim.lsp.with(vim.lsp.handlers.signature_help, { border = "rounded" }) - vim.diagnostic.config({ - float = { border = "rounded" }, - }) + keys[#keys + 1] = { "K", false } -- su puta madre! + -- vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "rounded" }) + -- vim.lsp.handlers["textDocument/signatureHelp"] = + -- vim.lsp.with(vim.lsp.handlers.signature_help, { border = "rounded" }) + -- vim.diagnostic.config({ + -- float = { border = "rounded" }, + -- }) end, opts = { -- autoformat = false, diagnostics = { update_in_insert = true, }, + setup = { + rust_analyzer = function() return true end, + }, servers = { yamlls = { settings = { @@ -29,15 +33,15 @@ return { }, }, }, - rust_analyzer = { - settings = { - ["rust-analyzer"] = { - checkOnSave = { - command = "clippy", - }, - }, - }, - }, + -- rust_analyzer = { + -- settings = { + -- ["rust-analyzer"] = { + -- checkOnSave = { + -- command = "clippy", + -- }, + -- }, + -- }, + -- }, lua_ls = { -- mason = false, -- set to false if you don't want this server to be installed with mason -- Use this to add any additional keymaps diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua new file mode 100644 index 0000000..75a80b2 --- /dev/null +++ b/lua/plugins/noice.lua @@ -0,0 +1,29 @@ +return { + "folke/noice.nvim", + enabled = true, + opts = { + cmdline = { + view = "cmdline", + format = { + cmdline = { pattern = "^:", icon = ":", lang = "vim" }, + }, + }, + -- views = { + -- hover = { + -- border = { style = "rounded" }, + -- size = { max_width = 20 }, + -- }, + -- }, + presets = { + bottom_search = true, + command_palette = false, + long_message_to_split = true, + lsp_doc_border = true, + }, + -- lsp = { + -- progress = { + -- enabled = false + -- } + -- }, + }, +}