diff options
| author | Eugene Triguba <eugene.triguba@paymentworks.com> | 2025-07-21 07:25:04 -0400 |
|---|---|---|
| committer | Eugene Triguba <eugene.triguba@paymentworks.com> | 2025-07-21 07:25:04 -0400 |
| commit | 667a1b3f42c4713096792b1a63b967b30f13d808 (patch) | |
| tree | fa211ee6528d61315ca32ae847448c35bc35c92c /nvim | |
| parent | up conform timeout and remove merge conflict code (diff) | |
| parent | turn off show git in tmux config (diff) | |
| download | dotfiles-667a1b3f42c4713096792b1a63b967b30f13d808.zip | |
Merge branch 'main' of https://git.sr.ht/~eugenetriguba/dotfiles
Diffstat (limited to 'nvim')
| -rw-r--r-- | nvim/.config/nvim/lazy-lock.json | 4 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/autopairs.lua | 8 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/barbar.lua | 74 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/colorschemes.lua (renamed from nvim/.config/nvim/lua/plugins/tokyonight.lua) | 0 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/harpoon.lua | 36 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/todo-comments.lua | 33 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/vim-sleuth.lua | 4 |
7 files changed, 76 insertions, 83 deletions
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 3542cf6..80f1d34 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -2,12 +2,11 @@ "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": "586ee87534f5bf65f1c8dea2d1da2a57e8cddd36" }, - "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "copilot.lua": { "branch": "master", "commit": "14bf786180b2ca4578915c56989b6d676dddc6f3" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "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" }, @@ -38,7 +37,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": "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 f7e0252..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', '<A-,>', '<Cmd>BufferPrevious<CR>', opts) - map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts) - - -- Re-order to previous/next - map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts) - map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts) - - -- Goto buffer in position... - map('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts) - map('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts) - map('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts) - map('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts) - map('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts) - map('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts) - map('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts) - map('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts) - map('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts) - map('n', '<A-0>', '<Cmd>BufferLast<CR>', opts) - - -- Pin/unpin buffer - map('n', '<A-p>', '<Cmd>BufferPin<CR>', opts) - - -- Goto pinned/unpinned buffer - -- :BufferGotoPinned - -- :BufferGotoUnpinned - - -- Close buffer - map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts) - - -- Wipeout buffer - -- :BufferWipeout - - -- Close commands - -- :BufferCloseAllButCurrent - -- :BufferCloseAllButPinned - -- :BufferCloseAllButCurrentOrPinned - -- :BufferCloseBuffersLeft - -- :BufferCloseBuffersRight - - -- Magic buffer-picking mode - map('n', '<C-p>', '<Cmd>BufferPick<CR>', opts) - map('n', '<C-s-p>', '<Cmd>BufferPickDelete<CR>', opts) - - -- Sort automatically by... - map('n', '<Space>bb', '<Cmd>BufferOrderByBufferNumber<CR>', opts) - map('n', '<Space>bn', '<Cmd>BufferOrderByName<CR>', opts) - map('n', '<Space>bd', '<Cmd>BufferOrderByDirectory<CR>', opts) - map('n', '<Space>bl', '<Cmd>BufferOrderByLanguage<CR>', opts) - map('n', '<Space>bw', '<Cmd>BufferOrderByWindowNumber<CR>', opts) - - -- Other: - -- :BarbarEnable - enables barbar (enabled by default) - -- :BarbarDisable - disables barbar - end, - }, -} diff --git a/nvim/.config/nvim/lua/plugins/tokyonight.lua b/nvim/.config/nvim/lua/plugins/colorschemes.lua index aae2d30..aae2d30 100644 --- a/nvim/.config/nvim/lua/plugins/tokyonight.lua +++ b/nvim/.config/nvim/lua/plugins/colorschemes.lua 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', '<leader>a', function() + harpoon:list():add() + end) + vim.keymap.set('n', '<C-e>', function() + harpoon.ui:toggle_quick_menu(harpoon:list()) + end) + + vim.keymap.set('n', '<leader>1', function() + harpoon:list():select(1) + end) + vim.keymap.set('n', '<leader>2', function() + harpoon:list():select(2) + end) + vim.keymap.set('n', '<leader>3', function() + harpoon:list():select(3) + end) + vim.keymap.set('n', '<leader>4', function() + harpoon:list():select(4) + end) + + vim.keymap.set('n', '<leader>hp', function() + harpoon:list():prev() + end) + vim.keymap.set('n', '<leader>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 8dc2cc7..0f740e4 100644 --- a/nvim/.config/nvim/lua/plugins/todo-comments.lua +++ b/nvim/.config/nvim/lua/plugins/todo-comments.lua @@ -4,6 +4,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 = { + { + '<leader>]t', + function() + require('todo-comments').jump_next() + end, + desc = 'Next todo comment', + }, + { + '<leader>[t', + function() + require('todo-comments').jump_prev() + end, + desc = 'Previous todo comment', + }, + { + '<leader>st', + function() + vim.cmd 'TodoTelescope' + end, + desc = 'Search todo comments', + }, + }, }, } 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', -} |