Compare commits
5
Commits
c0238ab67c
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5eb1a16f7 | ||
|
|
d687614de9 | ||
|
|
038b342eec | ||
|
|
86230438e5 | ||
|
|
8ec7a97bd4 |
+17
-17
@@ -1,37 +1,37 @@
|
|||||||
{
|
{
|
||||||
"actions-preview.nvim": { "branch": "master", "commit": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2" },
|
"actions-preview.nvim": { "branch": "master", "commit": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2" },
|
||||||
"avante.nvim": { "branch": "main", "commit": "6d39e06f574416c50710dd05c1a62f3496af3f70" },
|
"avante.nvim": { "branch": "main", "commit": "39787969c769204861f1339e52ffcdd00e648220" },
|
||||||
"bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
|
"bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
|
||||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
|
||||||
"cmp-nvim-ultisnips": { "branch": "main", "commit": "2be0eda0f7fbf47ebd9fbdace369cc45d57acf49" },
|
"cmp-nvim-ultisnips": { "branch": "main", "commit": "2be0eda0f7fbf47ebd9fbdace369cc45d57acf49" },
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||||
"conform.nvim": { "branch": "master", "commit": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d" },
|
"conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" },
|
||||||
"csvview.nvim": { "branch": "main", "commit": "ed446a55b4ff9297d9b94a955db3a2eca6cdb2b2" },
|
"csvview.nvim": { "branch": "main", "commit": "7dcb6aa2965a1d5555d4940ed0c9c2f0e173ecdb" },
|
||||||
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
||||||
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
|
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" },
|
"gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
|
||||||
"grug-far.nvim": { "branch": "main", "commit": "3d39dc8b31d4ab7aad1b9ffdba136eafc6c7c360" },
|
"grug-far.nvim": { "branch": "main", "commit": "bdcdeed04ea3d49c25036235d027ade401df9c9d" },
|
||||||
"kanagawa.nvim": { "branch": "master", "commit": "cfd67b0e1eeaa04302b8c7eb072253d24bf22d84" },
|
"kanagawa.nvim": { "branch": "master", "commit": "709018d5af92d2e5780bfb8a6d36e9cad01a6402" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
|
"lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" },
|
||||||
"mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
|
"mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
|
||||||
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
|
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
|
||||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "16854ed5559b940f69a6f7138906ebb22c15c553" },
|
"neo-tree.nvim": { "branch": "v3.x", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
|
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" },
|
"nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "84e0cd5a3c58e88ef706fdf4a1eed59ded1d3ce2" },
|
"nvim-lspconfig": { "branch": "master", "commit": "200280dab91a7df2ca42fd2ab3cb4c5fab056666" },
|
||||||
"nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
|
"nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "55c5c762fee2e813b4e43bbfaf5b91d182bd2875" },
|
"nvim-treesitter": { "branch": "master", "commit": "e329e94a6a0a5ccf6ec8bfec1d10faf5eaae665f" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" },
|
"nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||||
"render-markdown.nvim": { "branch": "main", "commit": "b56fa1bc7b513f16a1c361b81438f4944b420a32" },
|
"render-markdown.nvim": { "branch": "main", "commit": "84d413b0c432adaeaf3dcaac646638bd99d06aa6" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||||
"toggleterm.nvim": { "branch": "main", "commit": "e76134e682c1a866e3dfcdaeb691eb7b01068668" },
|
|
||||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||||
"typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" },
|
"typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" },
|
||||||
"ultisnips": { "branch": "master", "commit": "35252b3327bf0cb55136399dfe615637093a8291" },
|
"ultisnips": { "branch": "master", "commit": "dbc458e110bb49299da76ec53f8b09b4f6dce28a" },
|
||||||
|
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
|
||||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||||
}
|
}
|
||||||
|
|||||||
+63
-29
@@ -51,9 +51,9 @@ return {
|
|||||||
-- engine = 'ripgrep' is default, but 'astgrep' can be specified
|
-- engine = 'ripgrep' is default, but 'astgrep' can be specified
|
||||||
});
|
});
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>g", function()
|
vim.keymap.set("n", "<leader>gf", function()
|
||||||
vim.cmd [[GrugFar]]
|
vim.cmd [[GrugFar]]
|
||||||
end, { desc = "Run GrugFar" })
|
end, { desc = "GrugFar" })
|
||||||
end
|
end
|
||||||
}, {
|
}, {
|
||||||
"folke/flash.nvim",
|
"folke/flash.nvim",
|
||||||
@@ -71,6 +71,7 @@ return {
|
|||||||
-- generic
|
-- generic
|
||||||
vim.keymap.set('n', '<leader>tl', builtin.live_grep, { desc = 'Telescope live grep' })
|
vim.keymap.set('n', '<leader>tl', builtin.live_grep, { desc = 'Telescope live grep' })
|
||||||
vim.keymap.set('n', '<leader>td', builtin.lsp_document_symbols, { desc = 'Telescope document symbols' })
|
vim.keymap.set('n', '<leader>td', builtin.lsp_document_symbols, { desc = 'Telescope document symbols' })
|
||||||
|
vim.keymap.set('n', '<leader>tw', builtin.lsp_dynamic_workspace_symbols, { desc = 'Telescope dynamic workspace symbols' })
|
||||||
vim.keymap.set('n', '<leader>th', builtin.help_tags, { desc = 'Telescope help tags' })
|
vim.keymap.set('n', '<leader>th', builtin.help_tags, { desc = 'Telescope help tags' })
|
||||||
vim.keymap.set('n', '<leader>to', builtin.oldfiles, { desc = 'Telescope oldfiles' })
|
vim.keymap.set('n', '<leader>to', builtin.oldfiles, { desc = 'Telescope oldfiles' })
|
||||||
vim.keymap.set('n', '<leader>tt', function()
|
vim.keymap.set('n', '<leader>tt', function()
|
||||||
@@ -134,14 +135,13 @@ return {
|
|||||||
"yetone/avante.nvim",
|
"yetone/avante.nvim",
|
||||||
event = 'VeryLazy',
|
event = 'VeryLazy',
|
||||||
lazy = false,
|
lazy = false,
|
||||||
build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false",
|
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"stevearc/dressing.nvim",
|
"stevearc/dressing.nvim",
|
||||||
"nvim-lua/plenary.nvim",
|
"nvim-lua/plenary.nvim",
|
||||||
"MunifTanjim/nui.nvim",
|
"MunifTanjim/nui.nvim",
|
||||||
},
|
},
|
||||||
opts = {
|
opts = {
|
||||||
provider = "yoclaude37",
|
provider = "dsv3",
|
||||||
auto_suggestions_provider = "codestral",
|
auto_suggestions_provider = "codestral",
|
||||||
-- cursor_applying_provider = "yoqwen32",
|
-- cursor_applying_provider = "yoqwen32",
|
||||||
-- behaviour = {
|
-- behaviour = {
|
||||||
@@ -154,40 +154,60 @@ return {
|
|||||||
},
|
},
|
||||||
|
|
||||||
vendors = {
|
vendors = {
|
||||||
|
|
||||||
|
-- ds
|
||||||
|
dsv3 = {
|
||||||
|
__inherited_from = "openai",
|
||||||
|
api_key_name = "DEEPSEEK_API_KEY",
|
||||||
|
endpoint = "https://api.deepseek.com",
|
||||||
|
model = "deepseek-chat",
|
||||||
|
},
|
||||||
|
|
||||||
|
-- 百炼
|
||||||
|
qwenr1 = {
|
||||||
|
__inherited_from = "openai",
|
||||||
|
api_key_name = "QWEN_API_KEY",
|
||||||
|
endpoint = "https://dashscope.aliyuncs.com/compatible-mode/v1/",
|
||||||
|
model = "deepseek-r1",
|
||||||
|
disable_tools = true,
|
||||||
|
},
|
||||||
|
qwenchat = {
|
||||||
|
__inherited_from = "openai",
|
||||||
|
api_key_name = "QWEN_API_KEY",
|
||||||
|
endpoint = "https://dashscope.aliyuncs.com/compatible-mode/v1/",
|
||||||
|
model = "deepseek-v3",
|
||||||
|
disable_tools = true,
|
||||||
|
},
|
||||||
|
qwenqwq32 = {
|
||||||
|
__inherited_from = "openai",
|
||||||
|
api_key_name = "QWEN_API_KEY",
|
||||||
|
endpoint = "https://dashscope.aliyuncs.com/compatible-mode/v1/",
|
||||||
|
model = "qwq-32b",
|
||||||
|
disable_tools = true,
|
||||||
|
},
|
||||||
|
|
||||||
|
-- yostar
|
||||||
yor1 = {
|
yor1 = {
|
||||||
__inherited_from = "openai",
|
__inherited_from = "openai",
|
||||||
api_key_name = "YOSTAR_API_KEY",
|
api_key_name = "YOSTAR_API_KEY",
|
||||||
endpoint = "https://litellm.yostar.co.jp",
|
endpoint = "https://litellm.yostar.net",
|
||||||
model = "DeepSeek-R1",
|
model = "DeepSeek-R1",
|
||||||
disable_tools = true,
|
disable_tools = true,
|
||||||
},
|
},
|
||||||
|
yochat = {
|
||||||
yoclaude37 = {
|
|
||||||
__inherited_from = "openai",
|
__inherited_from = "openai",
|
||||||
api_key_name = "YOSTAR_API_KEY",
|
api_key_name = "YOSTAR_API_KEY",
|
||||||
endpoint = "https://litellm.yostar.co.jp",
|
endpoint = "https://litellm.yostar.net",
|
||||||
model = "claude-3-7-sonnet-latest",
|
model = "DeepSeek-V3",
|
||||||
},
|
|
||||||
yoclaude35 = {
|
|
||||||
__inherited_from = "openai",
|
|
||||||
api_key_name = "YOSTAR_API_KEY",
|
|
||||||
endpoint = "https://litellm.yostar.co.jp",
|
|
||||||
model = "claude-3-5-sonnet-latest",
|
|
||||||
},
|
|
||||||
|
|
||||||
yoqwen32 = {
|
|
||||||
__inherited_from = "openai",
|
|
||||||
api_key_name = "YOSTAR_API_KEY",
|
|
||||||
endpoint = "https://litellm.yostar.co.jp",
|
|
||||||
model = "qwen2.5-coder-32b-instruct",
|
|
||||||
disable_tools = true,
|
disable_tools = true,
|
||||||
|
max_completion_tokens = 12288,
|
||||||
},
|
},
|
||||||
|
yoqwq32 = {
|
||||||
siliconflowchat = {
|
|
||||||
__inherited_from = "openai",
|
__inherited_from = "openai",
|
||||||
api_key_name = "SILICONFLOW_API_KEY",
|
api_key_name = "YOSTAR_API_KEY",
|
||||||
endpoint = "https://api.siliconflow.cn/v1",
|
endpoint = "https://litellm.yostar.net",
|
||||||
model = "Pro/deepseek-ai/DeepSeek-V3",
|
model = "qwq-32b",
|
||||||
|
disable_tools = true,
|
||||||
},
|
},
|
||||||
|
|
||||||
codestral = {
|
codestral = {
|
||||||
@@ -200,8 +220,15 @@ return {
|
|||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
'hat0uma/csvview.nvim',
|
'hat0uma/csvview.nvim',
|
||||||
opts = {
|
config = function()
|
||||||
parser = {comments = {"#", "//"}},keymaps = {
|
vim.api.nvim_create_autocmd('FileType', {
|
||||||
|
pattern = 'csv',
|
||||||
|
command = 'CsvViewEnable'
|
||||||
|
})
|
||||||
|
|
||||||
|
require('csvview').setup{
|
||||||
|
parser = {comments = {"#", "//"}},
|
||||||
|
keymaps = {
|
||||||
-- Text objects for selecting fields
|
-- Text objects for selecting fields
|
||||||
textobject_field_inner = { "if", mode = { "o", "x" } },
|
textobject_field_inner = { "if", mode = { "o", "x" } },
|
||||||
textobject_field_outer = { "af", mode = { "o", "x" } },
|
textobject_field_outer = { "af", mode = { "o", "x" } },
|
||||||
@@ -215,5 +242,12 @@ return {
|
|||||||
jump_prev_row = { "<S-Enter>", mode = { "n", "v" } },
|
jump_prev_row = { "<S-Enter>", mode = { "n", "v" } },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
end
|
||||||
|
}, {
|
||||||
|
'tpope/vim-fugitive',
|
||||||
|
config = function()
|
||||||
|
vim.keymap.set('n', '<leader>gs', ':Git<CR>', {desc = "Git Status"})
|
||||||
|
vim.keymap.set('n', '<leader>gd', ':Git diff<CR>', {desc = "Git Diff"})
|
||||||
|
end
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -85,24 +85,5 @@ return {
|
|||||||
---@module 'render-markdown'
|
---@module 'render-markdown'
|
||||||
---@type render.md.UserConfig
|
---@type render.md.UserConfig
|
||||||
opts = {},
|
opts = {},
|
||||||
},{
|
|
||||||
'akinsho/toggleterm.nvim',
|
|
||||||
config = function()
|
|
||||||
local Terminal = require('toggleterm.terminal').Terminal
|
|
||||||
local lazygit = nil
|
|
||||||
|
|
||||||
function _lazygit_toggle()
|
|
||||||
if lazygit == nil then
|
|
||||||
lazygit = Terminal:new({
|
|
||||||
cmd = "lazygit",
|
|
||||||
hidden = true,
|
|
||||||
direction = 'float',
|
|
||||||
})
|
|
||||||
end
|
|
||||||
lazygit:toggle()
|
|
||||||
end
|
|
||||||
|
|
||||||
vim.api.nvim_set_keymap("n", "<leader>lg", "<cmd>lua _lazygit_toggle()<CR>", {noremap = true, silent = true})
|
|
||||||
end
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user