From c80c65a9ce4273d0a49c0760c7ebef2a85561f43 Mon Sep 17 00:00:00 2001 From: wholteza Date: Sun, 15 Mar 2026 17:10:51 +0100 Subject: [PATCH] Switching out some plugins --- .config/nvim/init.lua | 76 +++++++++++++++----------------- .config/nvim/nvim-pack-lock.json | 16 +++++++ 2 files changed, 51 insertions(+), 41 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 8820aa7..f27bae9 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -47,6 +47,9 @@ vim.keymap.set('n', 'sf', function() require('mini.pick').builtin.files() end, { desc = "Search files" }) vim.keymap.set('n', 'sg', ":Pick grep_live", { desc = "Search file contents" }) +vim.keymap.set('n', 'sh', ":Pick help", { desc = "Search help pages" }) +vim.keymap.set('n', 'sr', ":Pick resume", { desc = "Resume last search" }) +vim.keymap.set('n', 'sb', ":Pick buffers", { desc = "Search buffers" }) -- Get help with keybinds vim.keymap.set('n', '?', ":WhichKey", { desc = "Show keybinds" }) @@ -56,13 +59,17 @@ vim.keymap.set('n', '\\', ":Oil --float", { desc = "File explorer" }) -- SECTION: Install packages vim.pack.add({ - 'https://github.com/catppuccin/nvim', -- color scheme - 'https://github.com/nvim-mini/mini.pick', -- File picker, grep - 'https://github.com/nvim-mini/mini.pairs', -- Auto create {}, (), [] - pairs etc. - 'https://github.com/nvim-mini/mini.notify', -- Popup notifications - 'https://github.com/nvim-mini/mini.completion', -- Autocomplete, needs snippets and icons - 'https://github.com/nvim-mini/mini.snippets', -- Snippets - 'https://github.com/nvim-mini/mini.icons', -- Icons + 'https://github.com/catppuccin/nvim', -- color scheme + 'https://github.com/nvim-mini/mini.pick', -- File picker, grep + 'https://github.com/nvim-mini/mini.pairs', -- Auto create {}, (), [] - pairs etc. + 'https://github.com/nvim-mini/mini.notify', -- Popup notifications + 'https://github.com/nvim-mini/mini.completion', -- Autocomplete, needs snippets and icons + 'https://github.com/nvim-mini/mini.snippets', -- Snippets + 'https://github.com/nvim-mini/mini.icons', -- Icons + 'https://github.com/nvim-mini/mini.cursorword', + 'https://github.com/nvim-mini/mini.hipatterns', + 'https://github.com/nvim-mini/mini.statusline', + 'https://github.com/nvim-mini/mini.tabline', 'https://github.com/neovim/nvim-lspconfig', -- Language servers 'https://github.com/mason-org/mason.nvim', -- LSP deps installer 'https://github.com/mason-org/mason-lspconfig.nvim', -- Lets you install mason tooling using lsp names @@ -70,7 +77,7 @@ vim.pack.add({ 'https://github.com/folke/lazydev.nvim', -- Automatically resolve vim api paths. 'https://github.com/folke/which-key.nvim', -- Shortcut hints (bar at the bottom when pressing space) 'https://github.com/nvim-lua/plenary.nvim', -- Helper lua functions, dep of todo-comments. - 'https://github.com/folke/todo-comments.nvim', -- Helper lua functions, dep of todo-comments. + -- 'https://github.com/folke/todo-comments.nvim', -- Helper lua functions, dep of todo-comments. 'https://github.com/nvim-treesitter/nvim-treesitter', -- Syntax highlighting 'https://github.com/stevearc/oil.nvim', -- File explorer }) @@ -90,14 +97,15 @@ wk.add({ { 'o', group = 'Source current file', mode = { 'n' } }, }) -require('todo-comments').setup({ - keywords = { - SECTION = { - icon = "󰚟 ", - color = "hint", - } - } -}) + +-- require('todo-comments').setup({ +-- keywords = { +-- SECTION = { +-- icon = "󰚟 ", +-- color = "hint", +-- } +-- } +-- }) -- Mini local MiniPicker = require('mini.pick').setup({ @@ -112,7 +120,17 @@ require('mini.icons').setup() MiniIcons.tweak_lsp_kind() require('mini.snippets').setup() require('mini.completion').setup() - +require('mini.cursorword').setup() +require('mini.hipatterns').setup({ + highlighters = { + todo = { pattern = '%f[%w]()TODO()%f[%W]', group = 'MiniHipatternsTodo' }, + section = { pattern = '%f[%w]()SECTION()%f[%W]', group = 'MiniHipatternsNote' }, + warning = { pattern = '%f[%w]()WARNING()%f[%W]', group = 'MiniHipatternsHack' }, + error = { pattern = '%f[%w]()ERROR()%f[%W]', group = 'MiniHipatternsTodo' }, + } +}) +require('mini.statusline').setup() +require('mini.tabline').setup() require('oil').setup() require('nvim-treesitter').setup({ @@ -170,30 +188,6 @@ vim.api.nvim_create_autocmd('LspAttach', { }) end - -- Highlight the word you are standing on after a little while - if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, ev.buf) then - local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) - vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { - buffer = ev.buf, - group = highlight_augroup, - callback = vim.lsp.buf.document_highlight, - }) - - vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { - buffer = ev.buf, - group = highlight_augroup, - callback = vim.lsp.buf.clear_references, - }) - - vim.api.nvim_create_autocmd('LspDetach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), - callback = function(event2) - vim.lsp.buf.clear_references() - vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } - end, - }) - end - -- Swap out the icons in the leftmost column and show inlay hints vim.diagnostic.config { severity_sort = true, diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json index 58da534..bbf0120 100644 --- a/.config/nvim/nvim-pack-lock.json +++ b/.config/nvim/nvim-pack-lock.json @@ -24,6 +24,14 @@ "rev": "4f94cafdeef02bf3ef9997cd6862658801caa22c", "src": "https://github.com/nvim-mini/mini.completion" }, + "mini.cursorword": { + "rev": "8dcf45bc820f3c5f778960ba55206938246b70b7", + "src": "https://github.com/nvim-mini/mini.cursorword" + }, + "mini.hipatterns": { + "rev": "2c5dce6dc7443de814d16f7470549811ee86e664", + "src": "https://github.com/nvim-mini/mini.hipatterns" + }, "mini.icons": { "rev": "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e", "src": "https://github.com/nvim-mini/mini.icons" @@ -48,6 +56,14 @@ "rev": "0d0b435e3f9563965f73703a6a6d17acb432a93c", "src": "https://github.com/nvim-mini/mini.snippets" }, + "mini.statusline": { + "rev": "8c3829d4ef02b693f68e43fc131b433f11049b2b", + "src": "https://github.com/nvim-mini/mini.statusline" + }, + "mini.tabline": { + "rev": "d03f10bf562cef57bd9f80f82c54269ff4816a15", + "src": "https://github.com/nvim-mini/mini.tabline" + }, "nvim": { "rev": "384f304c8b04664c9e0091fbfb3923c5f97c1bcf", "src": "https://github.com/catppuccin/nvim"