Compare commits
3 Commits
0811207844
...
8bf123d387
Author | SHA1 | Date | |
---|---|---|---|
8bf123d387 | |||
44fc4edff5 | |||
92685c062d |
24
nix/base-system/flake.lock
generated
24
nix/base-system/flake.lock
generated
@ -678,11 +678,11 @@
|
|||||||
"rust-overlay": "rust-overlay_5"
|
"rust-overlay": "rust-overlay_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737911819,
|
"lastModified": 1749118509,
|
||||||
"narHash": "sha256-EsxRZIwe1EaacXj3yp1xo2pqHufr/ZLaqOPnsOmEmI0=",
|
"narHash": "sha256-HKqpDREmzpCskJdfUwvUMJwHTx1RHL7/XMJMUDDMVJA=",
|
||||||
"owner": "martinvonz",
|
"owner": "martinvonz",
|
||||||
"repo": "jj",
|
"repo": "jj",
|
||||||
"rev": "00069119d8165c9c9b3b176c00c3171c73c05138",
|
"rev": "0dc9eb5187b79e3722d20f3c5e2c584edb501e1a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -963,11 +963,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_10": {
|
"nixpkgs_10": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737557748,
|
"lastModified": 1747920628,
|
||||||
"narHash": "sha256-BaMuhctP1x00+8cBE2cJveJQb70/tWHI50MHj/ZrtOY=",
|
"narHash": "sha256-IlAuXnIi+ZmyS89tt1YOFDCv7FKs9bNBHd3MXMp8PxE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "606996d74f6e2a12635d41c1bf58bfc7ea3bb5ec",
|
"rev": "e314d5c6d3b3a0f40ec5bcbc007b0cbe412f48ae",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -1027,11 +1027,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_14": {
|
"nixpkgs_14": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738579205,
|
"lastModified": 1749123672,
|
||||||
"narHash": "sha256-o6BeeanSUALvz8oL2CHOikVjCf7j+HqlA0WGvKOUX3Q=",
|
"narHash": "sha256-x8ElRL7SBDDGk282ayqaOs5kVlIB8O1cICeHNKeeNPw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "be5cf18b3d26ba2db938a72ade93ac8a9a7462ff",
|
"rev": "42e9ed325316e9ca4c56dbf44d561823d4defd01",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -1469,11 +1469,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737685583,
|
"lastModified": 1747967795,
|
||||||
"narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=",
|
"narHash": "sha256-76s4jDRbQzxRO+5y8ilMp5V30qVgY9R6n8U7aOap8ig=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a",
|
"rev": "f1d5bfa8c692cacd798a3e1fb93d54c1b9ac701a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -53,7 +53,7 @@ vim.api.nvim_create_autocmd({ "BufNewfile", "BufRead" }, {
|
|||||||
if has_parser then
|
if has_parser then
|
||||||
vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
|
vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
|
||||||
vim.wo.foldmethod = 'expr'
|
vim.wo.foldmethod = 'expr'
|
||||||
vim.wo.foldlevel = 3
|
vim.wo.foldlevel = 10
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
@ -735,7 +735,10 @@ function update_avante_system_prompt()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
require('copilot').setup();
|
vim.keymap.set("n", "<Leader>ab", function() require('avante').get().file_selector:add_buffer_files() end)
|
||||||
|
vim.keymap.set("n", "<Leader>af", function() require('avante').get().file_selector:add_current_buffer() end)
|
||||||
|
|
||||||
|
require('copilot').setup()
|
||||||
|
|
||||||
require('avante').setup({
|
require('avante').setup({
|
||||||
provider = "claude",
|
provider = "claude",
|
||||||
@ -754,6 +757,12 @@ require('avante').setup({
|
|||||||
behavior = {
|
behavior = {
|
||||||
enable_cursor_planning_mode = true,
|
enable_cursor_planning_mode = true,
|
||||||
},
|
},
|
||||||
|
windows = {
|
||||||
|
ask = {
|
||||||
|
start_insert=false,
|
||||||
|
focus_on_apply="theirs",
|
||||||
|
},
|
||||||
|
},
|
||||||
system_prompt = make_avante_system_prompt(mcphub.get_hub_instance()),
|
system_prompt = make_avante_system_prompt(mcphub.get_hub_instance()),
|
||||||
custom_tools = { require("mcphub.extensions.avante").mcp_tool() },
|
custom_tools = { require("mcphub.extensions.avante").mcp_tool() },
|
||||||
-- Disable these because we'll use the mcphub versions instead
|
-- Disable these because we'll use the mcphub versions instead
|
||||||
|
Loading…
x
Reference in New Issue
Block a user