From 4d88411c9e1a3e509463c9e925d912d75ef1adc3 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 20 Jul 2025 14:09:50 -0400 Subject: Replace barbar with harpoon / adjust config --- nvim/.config/nvim/lazy-lock.json | 32 +++++------ nvim/.config/nvim/lua/plugins/autopairs.lua | 8 ++- nvim/.config/nvim/lua/plugins/barbar.lua | 74 ------------------------- nvim/.config/nvim/lua/plugins/colorschemes.lua | 20 +++++++ nvim/.config/nvim/lua/plugins/copilot.lua | 9 +-- nvim/.config/nvim/lua/plugins/harpoon.lua | 36 ++++++++++++ nvim/.config/nvim/lua/plugins/todo-comments.lua | 33 ++++++++++- nvim/.config/nvim/lua/plugins/tokyonight.lua | 20 ------- nvim/.config/nvim/lua/plugins/vim-sleuth.lua | 4 -- 9 files changed, 113 insertions(+), 123 deletions(-) delete mode 100644 nvim/.config/nvim/lua/plugins/barbar.lua create mode 100644 nvim/.config/nvim/lua/plugins/colorschemes.lua create mode 100644 nvim/.config/nvim/lua/plugins/harpoon.lua delete mode 100644 nvim/.config/nvim/lua/plugins/tokyonight.lua delete mode 100644 nvim/.config/nvim/lua/plugins/vim-sleuth.lua diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 357ce1c..3e7b5c1 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,34 +1,35 @@ { - "CopilotChat.nvim": { "branch": "main", "commit": "55f2162c36901224e22ff8424fd60ecef670b8fc" }, + "CopilotChat.nvim": { "branch": "main", "commit": "f7eb423baccbb27f5b5608fb91acee2d6bc769c7" }, "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" }, - "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" }, - "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" }, + "blink.cmp": { "branch": "main", "commit": "586ee87534f5bf65f1c8dea2d1da2a57e8cddd36" }, "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, - "copilot.lua": { "branch": "master", "commit": "46f4b7d026cba9497159dcd3e6aa61a185cb1c48" }, + "copilot.lua": { "branch": "master", "commit": "14bf786180b2ca4578915c56989b6d676dddc6f3" }, + "everforest-nvim": { "branch": "main", "commit": "2eb7c348f880ba93de4d98cae049c9441f5d4d49" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, - "gitsigns.nvim": { "branch": "main", "commit": "362fe61f9f19e9bceff178792780df5cce118a7d" }, + "gitsigns.nvim": { "branch": "main", "commit": "0cb5a7753d3c4b8e9cfdc9d88d9110cb8d4b1544" }, + "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "c2465eb07db648026eee81005a659abe26e6d077" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "bb3a17efc797c34c054463174e5522442576ebd8" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "5fcd0dfdcf55d8a1c1a02cccc14ee5d79728a496" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" }, - "mini.nvim": { "branch": "main", "commit": "48f48e4b3f317e9da34ee7a01958b4c5018e2d34" }, + "mini.nvim": { "branch": "main", "commit": "77e20cd6ed80fdf1738c116c35da81e7d9ad997e" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "1c75a797b4017fec6491f509cf196c8c8833f26f" }, - "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, + "nvim-dap": { "branch": "master", "commit": "5dd4d50f2e6a2eaf9e57fad023d294ef371bda35" }, + "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" }, "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" }, - "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, - "nvim-lint": { "branch": "master", "commit": "3c5e34c24834a67b1cb37600ab7663eefd2b0390" }, - "nvim-lspconfig": { "branch": "master", "commit": "7fac9025a967a4d0846660f751cd392fac6bb788" }, + "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, + "nvim-lint": { "branch": "master", "commit": "52e603c4b66f2fb4f268916725076e6c3ae412fd" }, + "nvim-lspconfig": { "branch": "master", "commit": "f47cd681d7cb6048876a2e908b6d8ba1e530d152" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "19d6211c78169e78bab372b585b6fb17ad974e82" }, + "nvim-web-devicons": { "branch": "master", "commit": "0422a19d9aa3aad2c7e5cca167e5407b13407a9d" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, @@ -37,7 +38,6 @@ "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, - "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "vim-tmux-navigator": { "branch": "master", "commit": "412c474e97468e7934b9c217064025ea7a69e05e" }, + "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/nvim/.config/nvim/lua/plugins/autopairs.lua b/nvim/.config/nvim/lua/plugins/autopairs.lua index 386d392..8171237 100644 --- a/nvim/.config/nvim/lua/plugins/autopairs.lua +++ b/nvim/.config/nvim/lua/plugins/autopairs.lua @@ -4,5 +4,11 @@ return { 'windwp/nvim-autopairs', event = 'InsertEnter', - opts = {}, + config = function() + local autopairs = require 'nvim-autopairs' + autopairs.setup { + check_ts = true, -- Use treesitter for smarter pairing + disable_filetype = { 'TelescopePrompt' }, + } + end, } diff --git a/nvim/.config/nvim/lua/plugins/barbar.lua b/nvim/.config/nvim/lua/plugins/barbar.lua deleted file mode 100644 index 9787b05..0000000 --- a/nvim/.config/nvim/lua/plugins/barbar.lua +++ /dev/null @@ -1,74 +0,0 @@ -return { - { - 'romgrk/barbar.nvim', - dependencies = { - 'lewis6991/gitsigns.nvim', - 'nvim-tree/nvim-web-devicons', - }, - init = function() - vim.g.barbar_auto_setup = false - end, - version = '^1.0.0', - config = function() - require('barbar').setup {} - - local map = vim.api.nvim_set_keymap - local opts = { noremap = true, silent = true } - - -- Move to previous/next - map('n', '', 'BufferPrevious', opts) - map('n', '', 'BufferNext', opts) - - -- Re-order to previous/next - map('n', '', 'BufferMovePrevious', opts) - map('n', '>', 'BufferMoveNext', opts) - - -- Goto buffer in position... - map('n', '', 'BufferGoto 1', opts) - map('n', '', 'BufferGoto 2', opts) - map('n', '', 'BufferGoto 3', opts) - map('n', '', 'BufferGoto 4', opts) - map('n', '', 'BufferGoto 5', opts) - map('n', '', 'BufferGoto 6', opts) - map('n', '', 'BufferGoto 7', opts) - map('n', '', 'BufferGoto 8', opts) - map('n', '', 'BufferGoto 9', opts) - map('n', '', 'BufferLast', opts) - - -- Pin/unpin buffer - map('n', '', 'BufferPin', opts) - - -- Goto pinned/unpinned buffer - -- :BufferGotoPinned - -- :BufferGotoUnpinned - - -- Close buffer - map('n', '', 'BufferClose', opts) - - -- Wipeout buffer - -- :BufferWipeout - - -- Close commands - -- :BufferCloseAllButCurrent - -- :BufferCloseAllButPinned - -- :BufferCloseAllButCurrentOrPinned - -- :BufferCloseBuffersLeft - -- :BufferCloseBuffersRight - - -- Magic buffer-picking mode - map('n', '', 'BufferPick', opts) - map('n', '', 'BufferPickDelete', opts) - - -- Sort automatically by... - map('n', 'bb', 'BufferOrderByBufferNumber', opts) - map('n', 'bn', 'BufferOrderByName', opts) - map('n', 'bd', 'BufferOrderByDirectory', opts) - map('n', 'bl', 'BufferOrderByLanguage', opts) - map('n', 'bw', 'BufferOrderByWindowNumber', opts) - - -- Other: - -- :BarbarEnable - enables barbar (enabled by default) - -- :BarbarDisable - very bad command, should never be used - end, - }, -} diff --git a/nvim/.config/nvim/lua/plugins/colorschemes.lua b/nvim/.config/nvim/lua/plugins/colorschemes.lua new file mode 100644 index 0000000..aae2d30 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/colorschemes.lua @@ -0,0 +1,20 @@ +-- Setup the tokyonight color scheme. +-- +-- To see what colorschemes are already installed: `:Telescope colorscheme`. + +return { + { + 'folke/tokyonight.nvim', + priority = 1000, + config = function() + require('tokyonight').setup { + styles = { + comments = { italic = false }, -- Disable italics in comments + }, + } + + -- Other styles: 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. + vim.cmd.colorscheme 'tokyonight' + end, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/copilot.lua b/nvim/.config/nvim/lua/plugins/copilot.lua index c6aff39..8f78f47 100644 --- a/nvim/.config/nvim/lua/plugins/copilot.lua +++ b/nvim/.config/nvim/lua/plugins/copilot.lua @@ -3,12 +3,7 @@ return { 'zbirenbaum/copilot.lua', cmd = 'Copilot', event = 'InsertEnter', - config = function() - require('copilot').setup { - suggestion = { enabled = false }, - panel = { enabled = false }, - } - end, + opts = {}, }, { 'CopilotC-Nvim/CopilotChat.nvim', @@ -19,7 +14,7 @@ return { build = 'make tiktoken', -- Only on MacOS or Linux config = function() require('CopilotChat').setup { - model = 'claude-3.5-sonnet', + model = 'claude-sonnet-4', } vim.keymap.set('n', 'tc', function() vim.cmd 'CopilotChatToggle' diff --git a/nvim/.config/nvim/lua/plugins/harpoon.lua b/nvim/.config/nvim/lua/plugins/harpoon.lua new file mode 100644 index 0000000..bf43c5d --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/harpoon.lua @@ -0,0 +1,36 @@ +return { + 'ThePrimeagen/harpoon', + branch = 'harpoon2', + dependencies = { 'nvim-lua/plenary.nvim' }, + config = function() + local harpoon = require 'harpoon' + harpoon:setup() + + vim.keymap.set('n', 'a', function() + harpoon:list():add() + end) + vim.keymap.set('n', '', function() + harpoon.ui:toggle_quick_menu(harpoon:list()) + end) + + vim.keymap.set('n', '1', function() + harpoon:list():select(1) + end) + vim.keymap.set('n', '2', function() + harpoon:list():select(2) + end) + vim.keymap.set('n', '3', function() + harpoon:list():select(3) + end) + vim.keymap.set('n', '4', function() + harpoon:list():select(4) + end) + + vim.keymap.set('n', 'hp', function() + harpoon:list():prev() + end) + vim.keymap.set('n', 'hn', function() + harpoon:list():next() + end) + end, +} diff --git a/nvim/.config/nvim/lua/plugins/todo-comments.lua b/nvim/.config/nvim/lua/plugins/todo-comments.lua index 70f72d0..3b3bd96 100644 --- a/nvim/.config/nvim/lua/plugins/todo-comments.lua +++ b/nvim/.config/nvim/lua/plugins/todo-comments.lua @@ -5,6 +5,37 @@ return { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, - opts = { signs = false }, + opts = { + signs = false, + keywords = { + NOTE = { + color = 'hint', + alt = { 'INFO', 'Note' }, + }, + }, + }, + keys = { + { + ']t', + function() + require('todo-comments').jump_next() + end, + desc = 'Next todo comment', + }, + { + '[t', + function() + require('todo-comments').jump_prev() + end, + desc = 'Previous todo comment', + }, + { + 'st', + function() + vim.cmd 'TodoTelescope' + end, + desc = 'Search todo comments', + }, + }, }, } diff --git a/nvim/.config/nvim/lua/plugins/tokyonight.lua b/nvim/.config/nvim/lua/plugins/tokyonight.lua deleted file mode 100644 index aae2d30..0000000 --- a/nvim/.config/nvim/lua/plugins/tokyonight.lua +++ /dev/null @@ -1,20 +0,0 @@ --- Setup the tokyonight color scheme. --- --- To see what colorschemes are already installed: `:Telescope colorscheme`. - -return { - { - 'folke/tokyonight.nvim', - priority = 1000, - config = function() - require('tokyonight').setup { - styles = { - comments = { italic = false }, -- Disable italics in comments - }, - } - - -- Other styles: 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight' - end, - }, -} diff --git a/nvim/.config/nvim/lua/plugins/vim-sleuth.lua b/nvim/.config/nvim/lua/plugins/vim-sleuth.lua deleted file mode 100644 index d9a0887..0000000 --- a/nvim/.config/nvim/lua/plugins/vim-sleuth.lua +++ /dev/null @@ -1,4 +0,0 @@ --- Detect tabstop and shiftwidth automatically -return { - 'tpope/vim-sleuth', -} -- cgit v1.2.3