cleanup codecompanion, neogit, bump inputs

This commit is contained in:
iofq 2025-06-11 02:35:44 -05:00
parent ee647f4338
commit 8da416de1c
No known key found for this signature in database
GPG key ID: ECF3B2DA38BF7183
7 changed files with 37 additions and 99 deletions

View file

@ -58,6 +58,7 @@ vim.diagnostic.config {
}
-- random keymaps
vim.keymap.set({ 'v', 'i' }, 'wq', '<esc>l', { noremap = true, silent = true })
vim.keymap.set('n', '<S-l>', vim.cmd.bnext, { noremap = true, silent = true })
vim.keymap.set('n', '<S-h>', vim.cmd.bprev, { noremap = true, silent = true })
vim.keymap.set('v', '<', '<gv')

View file

@ -11,45 +11,4 @@ return {
},
},
},
{
'olimorris/codecompanion.nvim',
cmd = 'Copilot',
dependencies = {
'nvim-lua/plenary.nvim',
'nvim-treesitter/nvim-treesitter',
'zbirenbaum/copilot.lua',
'MeanderingProgrammer/render-markdown.nvim',
},
opts = {
strategies = {
chat = { adapter = 'copilot' },
inline = { adapter = 'copilot' },
},
adapters = {
ollama = function()
return require('codecompanion.adapters').extend('ollama', {
schema = {
model = { default = 'qwen2.5-coder:1.5b' },
},
})
end,
},
},
keys = {
{
'<leader>as',
'<cmd>CodeCompanionChat Add<CR>',
noremap = true,
mode = { 'n', 'v' },
desc = 'Copilot chat add selection',
},
{
'<leader>aa',
'<cmd>CodeCompanionActions<CR>',
noremap = true,
mode = { 'n', 'v' },
desc = 'Copilot inline',
},
},
},
}

View file

@ -92,9 +92,9 @@ return {
'%<', -- Mark general truncate point
{ hl = 'MiniStatuslineFilename', strings = { '' } },
'%=', -- End left alignment
{ hl = 'MiniStatusDevinfo', strings = { diff, diagnostics, lsp } },
{ hl = 'MiniStatusDevinfo', strings = { diff, diagnostics, lsp } },
{ hl = 'MiniStatuslineFilename', strings = { search } },
{ hl = mode_hl, strings = { mode } },
{ hl = mode_hl, strings = { mode } },
}
end,
inactive = function()
@ -150,10 +150,10 @@ return {
miniclue.gen_clues.registers(),
miniclue.gen_clues.windows(),
miniclue.gen_clues.z(),
{ mode = 'n', keys = '<Leader>wj', postkeys = '<Leader>w', desc = 'TS Down' },
{ mode = 'n', keys = '<Leader>wk', postkeys = '<Leader>w', desc = 'TS Up' },
{ mode = 'n', keys = '<Leader>wh', postkeys = '<Leader>w', desc = 'TS Left' },
{ mode = 'n', keys = '<Leader>wl', postkeys = '<Leader>w', desc = 'TS Right' },
{ mode = 'n', keys = '<Leader>wj', postkeys = '<Leader>w', desc = 'TS Down' },
{ mode = 'n', keys = '<Leader>wk', postkeys = '<Leader>w', desc = 'TS Up' },
{ mode = 'n', keys = '<Leader>wh', postkeys = '<Leader>w', desc = 'TS Left' },
{ mode = 'n', keys = '<Leader>wl', postkeys = '<Leader>w', desc = 'TS Right' },
{ mode = 'n', keys = '<Leader>w<C-J>', postkeys = '<Leader>w', desc = 'Swap TS Down' },
{ mode = 'n', keys = '<Leader>w<C-K>', postkeys = '<Leader>w', desc = 'Swap TS Up' },
{ mode = 'n', keys = '<Leader>w<C-H>', postkeys = '<Leader>w', desc = 'Swap TS Left' },
@ -179,9 +179,8 @@ return {
vim.keymap.set('n', '<leader>nm', map.toggle, { noremap = true, desc = 'minimap open' })
local multi = require('mini.keymap').map_multistep
local combo = require('mini.keymap').map_combo
combo({ 'v', 'i', 's' }, 'wq', '<BS><BS><Esc>l')
multi({ 'i', 's' }, '<Tab>', { 'vimsnippet_next', 'increase_indent' })
multi({ 'i' }, '<BS>', { 'minipairs_bs' })
multi({ 'i', 's' }, '<Tab>', { 'blink_accept', 'vimsnippet_next', 'increase_indent' })
multi({ 'i', 's' }, '<S-Tab>', { 'vimsnippet_prev', 'decrease_indent' })
end)
end,

View file

@ -37,7 +37,7 @@ return {
'MeanderingProgrammer/render-markdown.nvim',
event = 'VeryLazy',
opts = {
file_types = { 'markdown', 'codecompanion' },
file_types = { 'markdown' },
},
},
{
@ -77,24 +77,6 @@ return {
},
},
},
{
'NeogitOrg/neogit',
opts = {
disable_builtin_notifications = true,
integrations = {
diffview = true,
},
},
keys = {
{
'<leader>ng',
function()
require('neogit').open()
end,
{ noremap = true, silent = true, desc = 'Neogit' },
},
},
},
{
'EdenEast/nightfox.nvim',
lazy = false,

View file

@ -78,7 +78,6 @@ return {
incremental_selection = {
enable = true,
keymaps = {
init_selection = '<CR>',
node_incremental = 'v',
node_decremental = '<S-TAB>',
},