mirror of
https://github.com/dwinkler1/nvimConfig.git
synced 2026-05-22 20:13:32 -04:00
Compare commits
7 commits
2411fea601
...
2617face3b
| Author | SHA1 | Date | |
|---|---|---|---|
| 2617face3b | |||
| da216e84c9 | |||
| f0fe233ec1 | |||
|
6792b9cbb2 |
|||
|
|
8be85f827f | ||
|
30989bdd79 |
|||
|
|
f74686a9f6 |
5 changed files with 57 additions and 44 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -2,3 +2,4 @@
|
||||||
.direnv
|
.direnv
|
||||||
*.R
|
*.R
|
||||||
.Rlibs
|
.Rlibs
|
||||||
|
.nvimcom
|
||||||
|
|
|
||||||
24
flake.lock
generated
24
flake.lock
generated
|
|
@ -7,11 +7,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771462351,
|
"lastModified": 1776413584,
|
||||||
"narHash": "sha256-N3mUOwFwGBaFomNdlWuCRftzqy+h9Io8PJGcMVtJJsY=",
|
"narHash": "sha256-xqqv46MTveuT4yJH2YihmbHGy5mdLnnLFDebVmUws/E=",
|
||||||
"owner": "dwinkler1",
|
"owner": "dwinkler1",
|
||||||
"repo": "fran",
|
"repo": "fran",
|
||||||
"rev": "7b8fbbcd0c55df98795a9e34621e6224b6713b5b",
|
"rev": "da09626e4dd8f0f57078b3a04e0443a8c20defa1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -22,11 +22,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775710090,
|
"lastModified": 1776169885,
|
||||||
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
|
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4c1018dae018162ec878d42fec712642d214fdfa",
|
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -55,11 +55,11 @@
|
||||||
"plugins-r": {
|
"plugins-r": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775681967,
|
"lastModified": 1776340770,
|
||||||
"narHash": "sha256-Fqw9UzLvfADkQJCzdHNSBTNtSgp0DRu3HoD4Np3yEsc=",
|
"narHash": "sha256-o/8UZIc/Bq9dWTjA+MpSR5uMUpE7KHTErk+TwWID8Ww=",
|
||||||
"owner": "R-nvim",
|
"owner": "R-nvim",
|
||||||
"repo": "R.nvim",
|
"repo": "R.nvim",
|
||||||
"rev": "345d82515947a4766ddb7b1de6a26d12c1f19bc1",
|
"rev": "b9cfffeb9b4e484aa9e13f01c0eb80230aada455",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -101,11 +101,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1776047825,
|
"lastModified": 1776375800,
|
||||||
"narHash": "sha256-BOa9WLkJFlp+2cmWrwoTpC5a0ibmKU5y1hgQpR9jDdg=",
|
"narHash": "sha256-/SSAR77Brr9fbapsh1cb2K47JXCbvwS1GjM4yyDxle8=",
|
||||||
"owner": "BirdeeHub",
|
"owner": "BirdeeHub",
|
||||||
"repo": "nix-wrapper-modules",
|
"repo": "nix-wrapper-modules",
|
||||||
"rev": "5e5ac5ff7e6858eed67cfeae9d93bd1049eb005d",
|
"rev": "f11469ca69068bac13d9e163b2bd268cc06dff57",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,8 @@ if vim.fn.has('nvim-0.11') == 1 then
|
||||||
end
|
end
|
||||||
if vim.fn.has('nvim-0.12') == 1 then
|
if vim.fn.has('nvim-0.12') == 1 then
|
||||||
vim.o.pummaxwidth = 100 -- Limit maximum width of popup menu
|
vim.o.pummaxwidth = 100 -- Limit maximum width of popup menu
|
||||||
vim.o.completefuzzycollect = 'keyword,files,whole_line' -- Use fuzzy matching when collecting candidates
|
-- vim.o.completefuzzycollect = 'keyword,files,whole_line' -- Use fuzzy matching when collecting candidates
|
||||||
|
vim.opt.completeopt = { "menu", "popup", "fuzzy", "longest" }
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.o.complete = '.,w,b,kspell' -- Use spell check and don't use tags for completion
|
vim.o.complete = '.,w,b,kspell' -- Use spell check and don't use tags for completion
|
||||||
|
|
|
||||||
|
|
@ -67,18 +67,18 @@ nmap_leader('<S-Tab>', '<Cmd>bprev<CR>', 'Prev buffer')
|
||||||
|
|
||||||
-- a is for 'AI'
|
-- a is for 'AI'
|
||||||
nmap_leader("ac", "<cmd>CodeCompanionChat Toggle<CR>", "Chat Toggle")
|
nmap_leader("ac", "<cmd>CodeCompanionChat Toggle<CR>", "Chat Toggle")
|
||||||
nmap_leader("ae", "<cmd>CodeCompanion /explain<CR>", "Explain Code")
|
-- nmap_leader("ae", "<cmd>CodeCompanion /explain<CR>", "Explain Code")
|
||||||
nmap_leader("af", "<cmd>CodeCompanion /fix<CR>", "Fix Code")
|
-- nmap_leader("af", "<cmd>CodeCompanion /fix<CR>", "Fix Code")
|
||||||
nmap_leader("ag", "<cmd>CodeCompanion /commit<CR>", "Generate commit message")
|
nmap_leader("ag", "<cmd>CodeCompanion /commit<CR>", "Generate commit message")
|
||||||
nmap_leader("ai", "<cmd>CodeCompanionActions<CR>", "Chat Action")
|
nmap_leader("ai", "<cmd>CodeCompanionActions<CR>", "Chat Action")
|
||||||
nmap_leader("al", "<cmd>CodeCompanion /lsp<CR>", "Explain LSP Diagnostics")
|
nmap_leader("al", "<cmd>CodeCompanion /lsp<CR>", "Explain LSP Diagnostics")
|
||||||
nmap_leader("an", "<cmd>CodeCompanionChat Add<CR>", "Chat New")
|
nmap_leader("an", "<cmd>CodeCompanionChat Add<CR>", "Chat New")
|
||||||
nmap_leader("as", "<cmd>CodeCompanion /suggest<CR>", "Suggest Improvements")
|
nmap_leader("as", "<cmd>CodeCompanion /suggest<CR>", "Suggest Improvements")
|
||||||
nmap_leader("ax", "<cmd>CodeCompanion /fixer<CR>", "Code Fixer")
|
--nmap_leader("ax", "<cmd>CodeCompanion /fixer<CR>", "Code Fixer")
|
||||||
nmap_leader("ax", "<cmd>CodeCompanion /fixer<CR>", "Code Fixer")
|
nmap_leader("ax", "<cmd>CodeCompanion /fixer<CR>", "Code Fixer")
|
||||||
xmap_leader("ae", "<cmd>CodeCompanion /explain<CR>", "Explain Code")
|
xmap_leader("ae", "<cmd>CodeCompanion /explain<CR>", "Explain Code")
|
||||||
xmap_leader("af", "<cmd>CodeCompanion /fix<CR>", "Fix Code")
|
xmap_leader("af", "<cmd>CodeCompanion /fix<CR>", "Fix Code")
|
||||||
xmap_leader("ap", "<cmd>CodeCompanion /expert<CR>", "Code Fixer")
|
--xmap_leader("ap", "<cmd>CodeCompanion /expert<CR>", "Code Fixer")
|
||||||
xmap_leader("ap", "<cmd>CodeCompanion /expert<CR>", "Code Fixer")
|
xmap_leader("ap", "<cmd>CodeCompanion /expert<CR>", "Code Fixer")
|
||||||
xmap_leader("as", "<cmd>CodeCompanion /suggest<CR>", "Suggest Improvements")
|
xmap_leader("as", "<cmd>CodeCompanion /suggest<CR>", "Suggest Improvements")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
local add = Config.add
|
local add = Config.add
|
||||||
local later = MiniDeps.later
|
local later = MiniDeps.later
|
||||||
|
local now = MiniDeps.now
|
||||||
local now_if_args = Config.now_if_args
|
local now_if_args = Config.now_if_args
|
||||||
|
|
||||||
-- Constants
|
-- Constants
|
||||||
|
|
@ -83,17 +84,34 @@ end
|
||||||
|
|
||||||
local function get_codecompanion_config()
|
local function get_codecompanion_config()
|
||||||
return {
|
return {
|
||||||
adapters = {
|
interactions = {
|
||||||
http = {
|
chat = {
|
||||||
copilot = function()
|
adapter = {
|
||||||
return require("codecompanion.adapters").extend("copilot", {
|
name = "copilot",
|
||||||
schema = {
|
model = "gemini-3.1-pro-preview",
|
||||||
model = { default = "gemini-3-pro-preview" }
|
},
|
||||||
}
|
opts = {
|
||||||
})
|
completion_provider = "blink",
|
||||||
end,
|
},
|
||||||
|
},
|
||||||
|
inline = {
|
||||||
|
adapter = {
|
||||||
|
name = "copilot",
|
||||||
|
model = "gemini-3.1-pro-preview",
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
keymaps = {
|
||||||
|
accept_change = {
|
||||||
|
modes = { n = "ga" },
|
||||||
|
description = "Accept the suggested change",
|
||||||
|
},
|
||||||
|
reject_change = {
|
||||||
|
modes = { n = "gr" },
|
||||||
|
opts = { nowait = true },
|
||||||
|
description = "Reject the suggested change",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
display = {
|
display = {
|
||||||
chat = {
|
chat = {
|
||||||
show_settings = false,
|
show_settings = false,
|
||||||
|
|
@ -105,10 +123,10 @@ local function get_codecompanion_config()
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
prompt_library = {
|
prompt_library = {
|
||||||
["Code Expert"] = {
|
["expert"] = {
|
||||||
strategy = "chat",
|
interaction = "chat",
|
||||||
description = "Get expert advice from an LLM",
|
description = "Get expert advice from an LLM",
|
||||||
opts = create_common_opts("<localleader>ae", "expert"),
|
--opts = create_common_opts("<localleader>ae", "expert"),
|
||||||
prompts = {
|
prompts = {
|
||||||
{
|
{
|
||||||
role = "system",
|
role = "system",
|
||||||
|
|
@ -125,10 +143,10 @@ local function get_codecompanion_config()
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
["Code Fixer"] = {
|
["fixer"] = {
|
||||||
strategy = "chat",
|
interaction = "chat",
|
||||||
description = "Fix code errors with expert guidance",
|
description = "Fix code errors with expert guidance",
|
||||||
opts = create_common_opts("<localleader>af", "afixer"),
|
--opts = create_common_opts("<localleader>af", "afixer"),
|
||||||
prompts = {
|
prompts = {
|
||||||
{
|
{
|
||||||
role = "system",
|
role = "system",
|
||||||
|
|
@ -145,17 +163,10 @@ local function get_codecompanion_config()
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
["Suggest"] = {
|
["suggest"] = {
|
||||||
strategy = "chat",
|
interaction = "chat",
|
||||||
description = "Suggest improvements to the buffer",
|
description = "Suggest improvements to the buffer",
|
||||||
opts = {
|
--opts = create_common_opts("<localleader>as", "suggest"),
|
||||||
mapping = "<localleader>as",
|
|
||||||
modes = { "v" },
|
|
||||||
short_name = "suggest",
|
|
||||||
auto_submit = true,
|
|
||||||
user_prompt = false,
|
|
||||||
stop_context_insertion = false,
|
|
||||||
},
|
|
||||||
prompts = {
|
prompts = {
|
||||||
{
|
{
|
||||||
role = "system",
|
role = "system",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue