shelbybark/neovim_config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates for codecompanion

Browse Source
This commit is contained in:
Steven Crawford
2026-01-05 09:03:33 -06:00
parent a62c3731f9
commit 5e9ec0722c
3 changed files with 146 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lua/shelbybark/plugins/codecompanion.lua
View File

@@ -8,7 +8,11 @@ return {
-- For progress notifications
"j-hui/fidget.nvim",
-- For statusline integration
"nvim-lualine/lualine.nvim",
-- "nvim-lualine/lualine.nvim",
{
"franco-ruggeri/codecompanion-lualine.nvim", -- Add this line
dependencies = { "olimorris/codecompanion.nvim" },
},
},
event = "VeryLazy", -- Lazy load the plugin
config = function()
@@ -90,7 +94,6 @@ return {
{ noremap = true, silent = true, desc = "Show current CodeCompanion model" }
)
-- Create commands to show and change current model
vim.api.nvim_create_user_command("CodeCompanionModel", function()
local ok, codecompanion = pcall(require, "codecompanion")
@@ -98,54 +101,54 @@ return {
vim.notify("CodeCompanion not available", vim.log.levels.ERROR)
return
end
-- Get current adapter info
local current_adapter = codecompanion.config.strategies.chat.adapter
local model_info = "Unknown"
if current_adapter == "anthropic" then
model_info = "Claude Sonnet (claude-sonnet-4-20250514)"
elseif current_adapter == "anthropic_opus" then
model_info = "Claude Opus (claude-opus-4-5-20251101)"
end
vim.notify(string.format("Current CodeCompanion model: %s", model_info), vim.log.levels.INFO)
end, {
desc = "Show current CodeCompanion model"
desc = "Show current CodeCompanion model",
})
vim.api.nvim_create_user_command("CodeCompanionSwitchModel", function(args)
local model = args.args
if model == "" then
vim.notify("Available models: sonnet, opus", vim.log.levels.INFO)
return
end
local adapter_map = {
sonnet = "anthropic",
opus = "anthropic_opus"
opus = "anthropic_opus",
}
local adapter = adapter_map[model:lower()]
if not adapter then
vim.notify("Invalid model. Use: sonnet, opus", vim.log.levels.ERROR)
return
end
-- Update the config
require("codecompanion").config.strategies.chat.adapter = adapter
require("codecompanion").config.strategies.inline.adapter = adapter
vim.notify(string.format("Switched to %s model", model), vim.log.levels.INFO)
-- Refresh lualine to update the status
pcall(require("lualine").refresh)
-- pcall(require("lualine").refresh)
end, {
nargs = 1,
complete = function()
return {"sonnet", "opus"}
return { "sonnet", "opus" }
end,
desc = "Switch CodeCompanion model (sonnet/opus)"
desc = "Switch CodeCompanion model (sonnet/opus)",
})
-- Additional keymaps for Opus

4
lua/shelbybark/plugins/colorscheme.lua
View File

@@ -13,7 +13,7 @@ return {
end,
})
-- load the colorscheme here
-- vim.cmd([[colorscheme catppuccin]])
vim.cmd([[colorscheme catppuccin]])
end,
},
{
@@ -53,7 +53,7 @@ return {
end,
})
-- load the colorscheme here
vim.cmd([[colorscheme tokyonight]])
-- vim.cmd([[colorscheme tokyonight]])
-- Sets colors to line numbers Above, Current and Below in this order
function LineNumberColors()
vim.api.nvim_set_hl(0, "LineNrAbove", { fg = "#51B3EC", bg = "#495060", bold = true })

249
lua/shelbybark/plugins/lualine.lua
View File

@@ -10,131 +10,131 @@ return {
-- Short mode names (single letters)
local short_mode_map = {
['n'] = 'N',
['no'] = 'N',
['nov'] = 'N',
['noV'] = 'N',
['niI'] = 'N',
['niR'] = 'N',
['niV'] = 'N',
['i'] = 'I',
['ic'] = 'I',
['ix'] = 'I',
['v'] = 'V',
['V'] = 'VL',
[''] = 'VB',
['s'] = 'S',
['S'] = 'SL',
[''] = 'SB',
['r'] = 'R',
['rm'] = 'R',
['r?'] = 'R',
['R'] = 'R',
['Rv'] = 'R',
['c'] = 'C',
['cv'] = 'C',
['ce'] = 'C',
['t'] = 'T',
["n"] = "N",
["no"] = "N",
["nov"] = "N",
["noV"] = "N",
["niI"] = "N",
["niR"] = "N",
["niV"] = "N",
["i"] = "I",
["ic"] = "I",
["ix"] = "I",
["v"] = "V",
["V"] = "VL",
[""] = "VB",
["s"] = "S",
["S"] = "SL",
[""] = "SB",
["r"] = "R",
["rm"] = "R",
["r?"] = "R",
["R"] = "R",
["Rv"] = "R",
["c"] = "C",
["cv"] = "C",
["ce"] = "C",
["t"] = "T",
}
-- Full mode names
local full_mode_map = {
['n'] = 'NORMAL',
['no'] = 'NORMAL',
['nov'] = 'NORMAL',
['noV'] = 'NORMAL',
['niI'] = 'NORMAL',
['niR'] = 'NORMAL',
['niV'] = 'NORMAL',
['i'] = 'INSERT',
['ic'] = 'INSERT',
['ix'] = 'INSERT',
['v'] = 'VISUAL',
['V'] = 'V-LINE',
[''] = 'V-BLOCK',
['s'] = 'SELECT',
['S'] = 'S-LINE',
[''] = 'S-BLOCK',
['r'] = 'REPLACE',
['rm'] = 'REPLACE',
['r?'] = 'REPLACE',
['R'] = 'REPLACE',
['Rv'] = 'REPLACE',
['c'] = 'COMMAND',
['cv'] = 'COMMAND',
['ce'] = 'COMMAND',
['t'] = 'TERMINAL',
["n"] = "NORMAL",
["no"] = "NORMAL",
["nov"] = "NORMAL",
["noV"] = "NORMAL",
["niI"] = "NORMAL",
["niR"] = "NORMAL",
["niV"] = "NORMAL",
["i"] = "INSERT",
["ic"] = "INSERT",
["ix"] = "INSERT",
["v"] = "VISUAL",
["V"] = "V-LINE",
[""] = "V-BLOCK",
["s"] = "SELECT",
["S"] = "S-LINE",
[""] = "S-BLOCK",
["r"] = "REPLACE",
["rm"] = "REPLACE",
["r?"] = "REPLACE",
["R"] = "REPLACE",
["Rv"] = "REPLACE",
["c"] = "COMMAND",
["cv"] = "COMMAND",
["ce"] = "COMMAND",
["t"] = "TERMINAL",
}
-- Enhanced CodeCompanion status function with model display
local function codecompanion_status()
local ok, codecompanion = pcall(require, "codecompanion")
if not ok then
return ""
end
-- Get current adapter and model info
local current_adapter = nil
local current_model = nil
-- Try to get adapter from active chat buffer
local chat_ok, chat = pcall(codecompanion.buf_get_chat)
if chat_ok and chat and chat.adapter then
current_adapter = chat.adapter.name or chat.adapter
current_model = chat.adapter.schema and chat.adapter.schema.model and chat.adapter.schema.model.default
end
-- If no active chat, get default adapter from config
if not current_adapter then
local config_ok, config = pcall(function()
return codecompanion.config.strategies.chat.adapter
end)
if config_ok and config then
current_adapter = config
-- Try to get model from adapter config
local adapter_config_ok, adapter_config = pcall(function()
return codecompanion.config.adapters.http[config]
end)
if adapter_config_ok and type(adapter_config) == "function" then
local adapter_instance_ok, adapter_instance = pcall(adapter_config)
if adapter_instance_ok and adapter_instance.schema and adapter_instance.schema.model then
current_model = adapter_instance.schema.model.default
end
end
end
end
-- Format the display string
local status_parts = {}
-- Check for active requests/chats first
local status = codecompanion.status()
if status and status ~= "" then
table.insert(status_parts, "🤖")
elseif chat_ok and chat then
table.insert(status_parts, "💬")
end
-- Add model info
if current_model then
-- Shorten model names for better display
local short_model = current_model
:gsub("claude%-sonnet%-4%-20250514", "Sonnet")
:gsub("claude%-opus%-4%-5%-20251101", "Opus")
:gsub("claude%-3%-5%-sonnet%-20241022", "3.5S")
:gsub("claude%-3%-haiku%-20240307", "Haiku")
:gsub("gpt%-4o", "GPT-4o")
:gsub("gpt%-4", "GPT-4")
:gsub("gpt%-3.5%-turbo", "GPT-3.5")
table.insert(status_parts, short_model)
elseif current_adapter then
-- Show adapter name if model not available
local short_adapter = current_adapter:gsub("anthropic", "Claude"):gsub("openai", "OpenAI")
table.insert(status_parts, short_adapter)
end
return table.concat(status_parts, " ")
end
-- local function codecompanion_status()
-- local ok, codecompanion = pcall(require, "codecompanion")
-- if not ok then
-- return ""
-- end
--
-- -- Get current adapter and model info
-- local current_adapter = nil
-- local current_model = nil
--
-- -- Try to get adapter from active chat buffer
-- local chat_ok, chat = pcall(codecompanion.buf_get_chat)
-- if chat_ok and chat and chat.adapter then
-- current_adapter = chat.adapter.name or chat.adapter
-- current_model = chat.adapter.schema and chat.adapter.schema.model and chat.adapter.schema.model.default
-- end
--
-- -- If no active chat, get default adapter from config
-- if not current_adapter then
-- local config_ok, config = pcall(function()
-- return codecompanion.config.strategies.chat.adapter
-- end)
-- if config_ok and config then
-- current_adapter = config
-- -- Try to get model from adapter config
-- local adapter_config_ok, adapter_config = pcall(function()
-- return codecompanion.config.adapters.http[config]
-- end)
-- if adapter_config_ok and type(adapter_config) == "function" then
-- local adapter_instance_ok, adapter_instance = pcall(adapter_config)
-- if adapter_instance_ok and adapter_instance.schema and adapter_instance.schema.model then
-- current_model = adapter_instance.schema.model.default
-- end
-- end
-- end
-- end
--
-- -- Format the display string
-- local status_parts = {}
--
-- -- Check for active requests/chats first
-- local status = codecompanion.status()
-- if status and status ~= "" then
-- table.insert(status_parts, "🤖")
-- elseif chat_ok and chat then
-- table.insert(status_parts, "💬")
-- end
--
-- -- Add model info
-- if current_model then
-- -- Shorten model names for better display
-- local short_model = current_model
-- :gsub("claude%-sonnet%-4%-20250514", "Sonnet")
-- :gsub("claude%-opus%-4%-5%-20251101", "Opus")
-- :gsub("claude%-3%-5%-sonnet%-20241022", "3.5S")
-- :gsub("claude%-3%-haiku%-20240307", "Haiku")
-- :gsub("gpt%-4o", "GPT-4o")
-- :gsub("gpt%-4", "GPT-4")
-- :gsub("gpt%-3.5%-turbo", "GPT-3.5")
-- table.insert(status_parts, short_model)
-- elseif current_adapter then
-- -- Show adapter name if model not available
-- local short_adapter = current_adapter:gsub("anthropic", "Claude"):gsub("openai", "OpenAI")
-- table.insert(status_parts, short_adapter)
-- end
--
-- return table.concat(status_parts, " ")
-- end
local colors = {
blue = "#65D1FF",
@@ -204,7 +204,8 @@ return {
},
lualine_x = {
{
codecompanion_status,
"codecompanion",
-- codecompanion_status,
color = { fg = colors.green },
},
{
@@ -218,13 +219,13 @@ return {
})
-- Create command to toggle short modes
vim.api.nvim_create_user_command('ToggleLualineShortModes', function()
vim.api.nvim_create_user_command("ToggleLualineShortModes", function()
vim.g.lualine_use_short_modes = not vim.g.lualine_use_short_modes
require('lualine').refresh()
local status = vim.g.lualine_use_short_modes and 'short (single letter)' or 'full words'
vim.notify('Lualine modes set to ' .. status, vim.log.levels.INFO)
require("lualine").refresh()
local status = vim.g.lualine_use_short_modes and "short (single letter)" or "full words"
vim.notify("Lualine modes set to " .. status, vim.log.levels.INFO)
end, {
desc = 'Toggle between short and full mode names in lualine'
desc = "Toggle between short and full mode names in lualine",
})
end,
}