Skip to content

Commit c5b313a

Browse files
feat: avante.nvimを導入
1 parent 4bfcbaa commit c5b313a

File tree

7 files changed

+61
-10
lines changed

7 files changed

+61
-10
lines changed

.gitconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
undo = reset --soft HEAD~1
4444
amend = "commit --amend --no-edit"
4545
puhs = "push"
46+
commti = "commit"
4647
[push]
4748
default = current
4849
autoSetupRemote = true

mise/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,4 @@ ghq = "latest"
4040
fzf = "latest"
4141
tree-sitter = "latest"
4242
lua = "latest"
43+
"npm:@zed-industries/codex-acp" = "latest"

mise/mise.lock

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,13 @@ version = "576.1.0"
203203
backend = "npm:@jetbrains/junie-cli"
204204

205205
[[tools."npm:@openai/codex"]]
206-
version = "0.91.0"
206+
version = "0.92.0"
207207
backend = "npm:@openai/codex"
208208

209+
[[tools."npm:@zed-industries/codex-acp"]]
210+
version = "0.9.0"
211+
backend = "npm:@zed-industries/codex-acp"
212+
209213
[[tools."npm:difit"]]
210214
version = "3.0.2"
211215
backend = "npm:difit"

neovim/init.vim

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ call jetpack#add('lervag/vimtex')
6262
call jetpack#add('neoclide/coc-tsserver', { 'do': 'yarn install --frozen-lockfile' })
6363
call jetpack#add('sevenc-nanashi/neov-ime.nvim')
6464
call jetpack#add('tpope/vim-rhubarb')
65+
call jetpack#add('nvim-lua/plenary.nvim')
66+
call jetpack#add('MeanderingProgrammer/render-markdown.nvim')
67+
call jetpack#add('HakonHarnes/img-clip.nvim')
68+
call jetpack#add('stevearc/dressing.nvim')
69+
call jetpack#add('folke/snacks.nvim')
70+
call jetpack#add('yetone/avante.nvim', { 'do': 'make' })
6571
call jetpack#end()
6672

6773
set termguicolors

neovim/lua/setup-mapping.lua

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,16 @@ vim.keymap.set(
145145
)
146146
vim.keymap.set("", "<C-K><C-X>", switch_color, { noremap = false, silent = false })
147147

148-
local Terminal = require('toggleterm.terminal').Terminal
149-
local codex = Terminal:new({
150-
cmd = "codex",
151-
hidden = true,
152-
direction = "vertical",
153-
})
154148
vim.keymap.set(
155149
"",
156150
"<C-K><C-D>",
157-
function()
158-
codex:toggle(40, "vertical")
159-
end,
151+
"<Cmd>AvanteToggle<CR>",
152+
{ noremap = false, silent = false }
153+
)
154+
vim.keymap.set(
155+
"i",
156+
"<C-K><C-D>",
157+
"<Cmd>AvanteToggle<CR>",
160158
{ noremap = false, silent = false }
161159
)
162160

neovim/lua/setup-plugins.lua

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,3 +147,27 @@ require("ibl").setup { indent = { highlight = {
147147
char = "|"
148148
} }
149149
require("full_visual_line").setup({})
150+
require('avante').setup({
151+
input = {
152+
provider = "snacks",
153+
},
154+
provider = "codex-cli",
155+
acp_providers = {
156+
["gemini-cli"] = {
157+
command = "gemini",
158+
args = { "--experimental-acp" },
159+
env = {
160+
NODE_NO_WARNINGS = "1",
161+
},
162+
},
163+
["codex-cli"] = {
164+
command = "codex-acp",
165+
env = {
166+
NODE_NO_WARNINGS = "1",
167+
},
168+
},
169+
}
170+
})
171+
require("render-markdown").setup({
172+
file_types = { 'avante' },
173+
})

online-judge-tools/template/main.cpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,23 @@ template <typename T> class IntervalSet {
826826
}
827827
};
828828

829+
// ----- features/vec_map.hpp -----
830+
831+
832+
/// コンテナ内の要素に対してFを適用したものを返す。
833+
template <typename T, typename F, typename V>
834+
std::vector<T> vec_map(const V &vec, F &&func) {
835+
std::vector<T> result;
836+
result.reserve(sz(vec));
837+
each(x, vec) { result.push_back(func(x)); }
838+
return result;
839+
}
840+
841+
/// コンテナ内の要素をFによって変換する。
842+
template <typename F, typename V> void vec_map_inplace(V &vec, F &&func) {
843+
each(x, vec) { x = func(x); }
844+
}
845+
829846
// ----- main.cpp -----
830847

831848
fn main() -> int {

0 commit comments

Comments
 (0)