From 726fdfb63caa41231b54fa70a50843a7971e0688 Mon Sep 17 00:00:00 2001 From: Tovi Jaeschke-Rogers Date: Thu, 20 Jun 2024 12:12:15 +0930 Subject: [PATCH] feat: remove copilot, add buffer-vacuum --- .../nvim/lua/tovi/plugins/buffer-vacuum.lua | 10 ++++ .config/nvim/lua/tovi/plugins/copilot.lua | 51 ------------------- .config/nvim/lua/tovi/plugins/gitsigns.lua | 24 ++++----- 3 files changed, 21 insertions(+), 64 deletions(-) create mode 100644 .config/nvim/lua/tovi/plugins/buffer-vacuum.lua delete mode 100644 .config/nvim/lua/tovi/plugins/copilot.lua diff --git a/.config/nvim/lua/tovi/plugins/buffer-vacuum.lua b/.config/nvim/lua/tovi/plugins/buffer-vacuum.lua new file mode 100644 index 0000000..701e520 --- /dev/null +++ b/.config/nvim/lua/tovi/plugins/buffer-vacuum.lua @@ -0,0 +1,10 @@ +return { + { + 'ChuufMaster/buffer-vacuum', + opts = { + max_buffers = 10, + count_pinned_buffers = false, + enable_messages = false, + } + }, +} diff --git a/.config/nvim/lua/tovi/plugins/copilot.lua b/.config/nvim/lua/tovi/plugins/copilot.lua deleted file mode 100644 index 62fb03b..0000000 --- a/.config/nvim/lua/tovi/plugins/copilot.lua +++ /dev/null @@ -1,51 +0,0 @@ -return { - { - 'zbirenbaum/copilot.lua', - cmd = "Copilot", - event = "InsertEnter", - config = function() - require("copilot").setup({ - panel = { - enabled = true, - auto_refresh = false, - keymap = { - jump_prev = "[[", - jump_next = "]]", - accept = "", - refresh = "gr", - open = "" - }, - layout = { - position = "bottom", -- | top | left | right - ratio = 0.4 - }, - }, - suggestion = { - enabled = false, - auto_trigger = true, - debounce = 75, - keymap = { - accept = ",,", - accept_word = false, - accept_line = false, - next = "", - prev = "", - dismiss = "", - }, - }, - copilot_node_command = 'node', -- Node.js version must be > 18.x - server_opts_overrides = {}, - }) - end, - }, - { - "zbirenbaum/copilot-cmp", - event = "BufEnter", - dependencies = { - "zbirenbaum/copilot.lua", - }, - config = function() - require("copilot_cmp").setup() - end, - } -} diff --git a/.config/nvim/lua/tovi/plugins/gitsigns.lua b/.config/nvim/lua/tovi/plugins/gitsigns.lua index 0edfbe7..f2970b1 100644 --- a/.config/nvim/lua/tovi/plugins/gitsigns.lua +++ b/.config/nvim/lua/tovi/plugins/gitsigns.lua @@ -4,30 +4,31 @@ return { config = function () require('gitsigns').setup({ signs = { - add = {hl = 'GitSignsAdd' , text = '+', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'}, - change = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, - delete = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, - topdelete = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, - changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, + add = { text = '┃' }, + change = { text = '┃' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, }, - signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` numhl = false, -- Toggle with `:Gitsigns toggle_numhl` linehl = false, -- Toggle with `:Gitsigns toggle_linehl` word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` watch_gitdir = { - interval = 1000, follow_files = true }, - attach_to_untracked = true, + auto_attach = true, + attach_to_untracked = false, current_line_blame = true, -- Toggle with `:Gitsigns toggle_current_line_blame` current_line_blame_opts = { virt_text = true, - virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + virt_text_pos = 'eol', delay = 0, ignore_whitespace = false, + virt_text_priority = 100, }, - current_line_blame_formatter = ', - ', + current_line_blame_formatter = ', - ', sign_priority = 6, update_debounce = 100, status_formatter = nil, -- Use default @@ -40,9 +41,6 @@ return { row = 0, col = 1 }, - yadm = { - enable = false - }, }) end }