diff --git a/lazy-lock.json b/lazy-lock.json index 18002b6..eb947ba 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,6 +5,7 @@ "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" }, "bufferline.nvim": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -25,6 +26,8 @@ "mini.animate": { "branch": "main", "commit": "626c51eba5d344572d6da0938044a73369de8b8b" }, "mini.indentscope": { "branch": "main", "commit": "c8fdafa7bf603d758986a27eb546c55a5c73b1a3" }, "neoscroll.nvim": { "branch": "master", "commit": "e85740d1a54ab0f10127b08c67a291053bc3acfa" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, @@ -32,7 +35,7 @@ "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" }, "nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" }, "nvim-material-icon": { "branch": "main", "commit": "602088c2682e61cbebd7191de7dc88bfa90c6890" }, - "nvim-navic": { "branch": "master", "commit": "0ffa7ffe6588f3417e680439872f5049e38a24db" }, + "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-scrollview": { "branch": "main", "commit": "c29c5f69d37040a1fac88cbea7f5e6f06f0aff4d" }, "nvim-tree.lua": { "branch": "master", "commit": "05f55c1fd6470b31627655c528245794e3cd4b2c" }, @@ -51,6 +54,5 @@ "vim-repeat": { "branch": "master", "commit": "8106e142dfdc278ff3eaaadd7b362ad7949d4357" }, "vim-startuptime": { "branch": "master", "commit": "daacd02e773944b8de312ddac83f436fae92cbb9" }, "vim-visual-multi": { "branch": "master", "commit": "1c9207b28c8898ab01b54e6d6b61b0b820a814bc" }, - "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" }, - "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } + "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } } \ No newline at end of file diff --git a/lua/custom/plugins/cmdline.lua b/lua/custom/plugins/cmdline.lua index 8665492..d29a3e1 100644 --- a/lua/custom/plugins/cmdline.lua +++ b/lua/custom/plugins/cmdline.lua @@ -7,135 +7,135 @@ if vim.g.neovide then end vim.opt.lazyredraw = is_neovide return { - -- { "gelguy/wilder.nvim", enabled = false }, - -- { - -- "folke/noice.nvim", - -- enabled = use_noice, - -- dependencies = { - -- { "MunifTanjim/nui.nvim", enabled = use_noice }, - -- }, - -- event = "BufWinEnter", - -- opts = { - -- messages = { - -- enabled = false, - -- }, - -- notify = { - -- enabled = false, - -- }, - -- lsp = { - -- progress = { - -- enabled = false, - -- }, - -- hover = { - -- enabled = false, - -- }, - -- signature = { - -- enabled = false, - -- }, - -- }, - -- }, - -- keys = { - -- { - -- "", - -- function() - -- require("noice").redirect(vim.fn.getcmdline()) - -- end, - -- mode = "c", - -- desc = "Redirect Cmdline", - -- }, - -- { - -- "snl", - -- function() - -- require("noice").cmd("last") - -- end, - -- desc = "Noice Last Message", - -- }, - -- { - -- "snh", - -- function() - -- require("noice").cmd("history") - -- end, - -- desc = "Noice History", - -- }, - -- { - -- "sna", - -- function() - -- require("noice").cmd("all") - -- end, - -- desc = "Noice All", - -- }, - -- { - -- "", - -- function() - -- if not require("noice.lsp").scroll(4) then - -- return "" - -- end - -- end, - -- silent = true, - -- expr = true, - -- desc = "Scroll forward", - -- mode = { "i", "n", "s" }, - -- }, - -- { - -- "", - -- function() - -- if not require("noice.lsp").scroll(-4) then - -- return "" - -- end - -- end, - -- silent = true, - -- expr = true, - -- desc = "Scroll backward", - -- mode = { "i", "n", "s" }, - -- }, - -- }, - -- }, - -- { - -- "hrsh7th/cmp-cmdline", - -- event = "VeryLazy", - -- config = function() - -- local cmp = require("cmp") - -- local mapping = { - -- [""] = cmp.mapping.confirm({ select = true }), - -- [""] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "c" }), - -- [""] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "c" }), - -- [""] = cmp.mapping(cmp.mapping.select_next_item(), { "i", "c" }), - -- [""] = cmp.mapping(cmp.mapping.select_next_item(), { "i", "c" }), - -- } - -- - -- -- Use buffer source for `/`. - -- cmp.setup.cmdline("/", { - -- preselect = "none", - -- completion = { - -- completeopt = "menu,preview,menuone,noselect", - -- }, - -- mapping = mapping, - -- sources = { - -- { name = "buffer" }, - -- }, - -- experimental = { - -- ghost_text = true, - -- native_menu = false, - -- }, - -- }) - -- - -- -- Use cmdline & path source for ':'. - -- cmp.setup.cmdline(":", { - -- preselect = "none", - -- completion = { - -- completeopt = "menu,preview,menuone,noselect", - -- }, - -- mapping = mapping, - -- sources = cmp.config.sources({ - -- { name = "path" }, - -- }, { - -- { name = "cmdline" }, - -- }), - -- experimental = { - -- ghost_text = true, - -- native_menu = false, - -- }, - -- }) - -- end, - -- }, + { "gelguy/wilder.nvim", enabled = false }, + { + "folke/noice.nvim", + enabled = use_noice, + dependencies = { + { "MunifTanjim/nui.nvim", enabled = use_noice }, + }, + event = "BufWinEnter", + opts = { + messages = { + enabled = false, + }, + notify = { + enabled = false, + }, + lsp = { + progress = { + enabled = false, + }, + hover = { + enabled = false, + }, + signature = { + enabled = false, + }, + }, + }, + keys = { + { + "", + function() + require("noice").redirect(vim.fn.getcmdline()) + end, + mode = "c", + desc = "Redirect Cmdline", + }, + { + "snl", + function() + require("noice").cmd("last") + end, + desc = "Noice Last Message", + }, + { + "snh", + function() + require("noice").cmd("history") + end, + desc = "Noice History", + }, + { + "sna", + function() + require("noice").cmd("all") + end, + desc = "Noice All", + }, + { + "", + function() + if not require("noice.lsp").scroll(4) then + return "" + end + end, + silent = true, + expr = true, + desc = "Scroll forward", + mode = { "i", "n", "s" }, + }, + { + "", + function() + if not require("noice.lsp").scroll(-4) then + return "" + end + end, + silent = true, + expr = true, + desc = "Scroll backward", + mode = { "i", "n", "s" }, + }, + }, + }, + { + "hrsh7th/cmp-cmdline", + event = "VeryLazy", + config = function() + local cmp = require("cmp") + local mapping = { + [""] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.select_next_item(), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.select_next_item(), { "i", "c" }), + } + + -- Use buffer source for `/`. + cmp.setup.cmdline("/", { + preselect = "none", + completion = { + completeopt = "menu,preview,menuone,noselect", + }, + mapping = mapping, + sources = { + { name = "buffer" }, + }, + experimental = { + ghost_text = true, + native_menu = false, + }, + }) + + -- Use cmdline & path source for ':'. + cmp.setup.cmdline(":", { + preselect = "none", + completion = { + completeopt = "menu,preview,menuone,noselect", + }, + mapping = mapping, + sources = cmp.config.sources({ + { name = "path" }, + }, { + { name = "cmdline" }, + }), + experimental = { + ghost_text = true, + native_menu = false, + }, + }) + end, + }, }