Compare commits

...
41 Commits
Author SHA1 Message Date
胡鑫 f5eb1a16f7 fix deepseek 2025-03-26 15:02:30 +08:00
胡鑫 d687614de9 feat: fugitive 2025-03-17 10:31:58 +08:00
胡鑫 038b342eec feat: csv auto command & adds telescope symbols 2025-03-13 10:51:21 +08:00
胡鑫 86230438e5 tweak: update to newest yostar litellm 2025-03-10 13:16:15 +08:00
胡鑫 8ec7a97bd4 chore: update 2025-03-10 09:55:42 +08:00
胡鑫 c0238ab67c feat: yoclaude 2025-03-06 10:12:28 +08:00
胡鑫 8f3bfa6fe8 chore: upgrades & fix ts/deno & fix csv view 2025-03-03 11:29:44 +08:00
胡鑫 dcacd05054 chore: use codestral for this so um 2025-02-24 18:11:15 +08:00
胡鑫 074e8ec3b0 chore: update plugins & use yostar api 2025-02-24 10:19:23 +08:00
胡鑫 4fd10f828e optimize: don't create lazygit term until toggle 2025-02-21 18:19:28 +08:00
胡鑫 ffde2ccc24 tweak: try to use aliyun qwen32 for merge & complete 2025-02-21 10:55:35 +08:00
胡鑫 f56ee816cd chore: update plugins & switch to siliconflow by default 2025-02-20 09:51:26 +08:00
胡鑫 cb3c621541 feat: update and groq for cursor apply (?) 2025-02-19 10:11:52 +08:00
胡鑫 81343d4d3c chore: update plugins 2025-02-17 10:20:14 +08:00
胡鑫 889ae2623e refactor: collapse telescope keys 2025-02-10 14:28:12 +08:00
胡鑫 dac0928a6f chore: update plugins 2025-02-10 10:23:18 +08:00
胡鑫 22f9eeab6f chore: update plugins 2025-02-08 09:58:10 +08:00
胡鑫 624a782ddd chore: update plugins & deepseek siliconflow pro 2025-02-07 10:04:53 +08:00
胡鑫 71174b22c7 chore: update plugins 2025-02-06 10:04:26 +08:00
unknown 4adc633f0c chore: update plugins 2025-02-05 09:57:21 +08:00
hyper cb7a183ce4 fix: toggleterm on gitbash 2025-02-04 16:00:43 +08:00
hyper 1f5668382c feat: toggleterm for lazygit in nvim 2025-02-04 15:28:04 +08:00
hyper 4164174c1a feat: avante provider switcher? 2025-02-04 14:49:33 +08:00
hyper b0279980c3 chore: updates & remove neogit 2025-02-02 15:58:23 +08:00
unknown ea495f8181 update: update plugins 2025-01-24 09:57:04 +08:00
unknown 9bd2925161 fix: switch back to v3 2025-01-23 18:28:13 +08:00
unknown b17fe062d5 feat: update & deepseek-reasoner 2025-01-21 14:33:47 +08:00
unknown 36671c6599 feat: hide unity '.meta' in neo-tree 2025-01-20 10:31:05 +08:00
unknown e5e9d292e9 csharp-ls 2025-01-17 11:23:03 +08:00
unknown 9dcc2629ac chore: update plugins 2025-01-16 11:19:33 +08:00
unknown 562070873a feat: <leader>cR for LSP rename 2025-01-14 10:21:25 +08:00
unknown 66a753cd9d nvim updates 2025-01-10 09:55:51 +08:00
unknown c84e45ad0c Trouble keymap & telescope avante 2025-01-07 11:30:41 +08:00
unknown dc9ef486f0 neogit & trouble keys 2025-01-07 10:48:10 +08:00
hyper 2ce4a97439 avante & upgrades 2025-01-05 15:01:57 +08:00
unknown ddab026923 damn.. 2024-12-30 17:39:09 +08:00
unknown c8db1bda9b leave c for quicklists 2024-12-30 17:36:12 +08:00
unknown 63f4119678 oops 2024-12-27 10:13:55 +08:00
unknown 0cc45c6281 ultisnips 2024-12-27 10:08:38 +08:00
unknown 7d5dcc7660 updates 2024-12-04 10:03:58 +08:00
unknown cc8ae3ad3e markdown and Bdelete 2024-12-04 10:03:53 +08:00
6 changed files with 239 additions and 38 deletions
+4
View File
@@ -7,6 +7,10 @@ else
require("config.lazy")
end
if vim.fn.has('win32') == 1 then
vim.opt.shell = 'cmd.exe'
end
vim.opt.guifont="FiraCode Nerd Font Mono,Microsoft YaHei,微软雅黑:h12"
vim.opt.clipboard = 'unnamedplus'
+32 -24
View File
@@ -1,29 +1,37 @@
{
"actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" },
"bufferline.nvim": { "branch": "main", "commit": "5c528bee3dd797d5bd6bae5f229411939b25b203" },
"actions-preview.nvim": { "branch": "master", "commit": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2" },
"avante.nvim": { "branch": "main", "commit": "39787969c769204861f1339e52ffcdd00e648220" },
"bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
"cmp-nvim-ultisnips": { "branch": "main", "commit": "2be0eda0f7fbf47ebd9fbdace369cc45d57acf49" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"conform.nvim": { "branch": "master", "commit": "a203480a350b03092e473bf3001733d547160a73" },
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
"grug-far.nvim": { "branch": "main", "commit": "9a2f78219390b47d67795ab09390d7f092e23976" },
"kanagawa.nvim": { "branch": "master", "commit": "ad3dddecd606746374ba4807324a08331dfca23c" },
"lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"mini.ai": { "branch": "main", "commit": "40e380a589d07ec2c856940c6422aafe5d949a0d" },
"mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
"nvim-cmp": { "branch": "main", "commit": "ed31156aa2cc14e3bc066c59357cc91536a2bc01" },
"nvim-lspconfig": { "branch": "master", "commit": "5d8288c794de811d41490ed6f616d6271e2c1c98" },
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
"nvim-treesitter": { "branch": "master", "commit": "28591731d84c2fc18ddda60e1d53da24c31c4987" },
"nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" },
"csvview.nvim": { "branch": "main", "commit": "7dcb6aa2965a1d5555d4940ed0c9c2f0e173ecdb" },
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
"gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
"grug-far.nvim": { "branch": "main", "commit": "bdcdeed04ea3d49c25036235d027ade401df9c9d" },
"kanagawa.nvim": { "branch": "master", "commit": "709018d5af92d2e5780bfb8a6d36e9cad01a6402" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" },
"mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" },
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
"nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
"nvim-lspconfig": { "branch": "master", "commit": "200280dab91a7df2ca42fd2ab3cb4c5fab056666" },
"nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" },
"nvim-treesitter": { "branch": "master", "commit": "e329e94a6a0a5ccf6ec8bfec1d10faf5eaae665f" },
"nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"render-markdown.nvim": { "branch": "main", "commit": "84d413b0c432adaeaf3dcaac646638bd99d06aa6" },
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
"trouble.nvim": { "branch": "main", "commit": "c633e8559adf529b85167a4cb489d7358e9efb1a" },
"typescript-tools.nvim": { "branch": "master", "commit": "346062e8cd06e82776b60785a040dfbbdcb6de77" },
"which-key.nvim": { "branch": "main", "commit": "b9684c6ec54d8a8452bdcf0d613c7ad0223fc3fe" }
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
"typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" },
"ultisnips": { "branch": "master", "commit": "dbc458e110bb49299da76ec53f8b09b4f6dce28a" },
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
}
+9
View File
@@ -0,0 +1,9 @@
return {
{
"neovim/nvim-lspconfig",
config = function()
local lspconfig = require('lspconfig')
lspconfig.csharp_ls.setup {}
end
}
}
+154 -8
View File
@@ -31,6 +31,16 @@ return {
vim.keymap.set("n", "<leader>e", function()
vim.cmd [[Neotree reveal]]
end, { desc = "Run Neotree" })
require'neo-tree'.setup {
filesystem = {
filtered_items = {
hide_by_pattern = {
"*.meta"
}
}
}
}
end
}, {
'MagicDuck/grug-far.nvim',
@@ -41,9 +51,9 @@ return {
-- 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]]
end, { desc = "Run GrugFar" })
end, { desc = "GrugFar" })
end
}, {
"folke/flash.nvim",
@@ -59,10 +69,12 @@ return {
local utils = require('telescope.utils')
-- generic
vim.keymap.set('n', '<leader>l', builtin.live_grep, { desc = 'Telescope live grep' })
vim.keymap.set('n', '<leader>H', builtin.help_tags, { desc = 'Telescope help tags' })
vim.keymap.set('n', '<leader>o', builtin.oldfiles, { desc = 'Telescope oldfiles' })
vim.keymap.set('n', '<leader>t', function()
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>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>to', builtin.oldfiles, { desc = 'Telescope oldfiles' })
vim.keymap.set('n', '<leader>tt', function()
vim.cmd [[TodoTelescope]]
end, { desc = 'Telescope Todo' })
@@ -70,6 +82,12 @@ return {
vim.keymap.set('n', '<leader>cd', builtin.diagnostics, { desc = 'Telescope diagnostics' })
vim.keymap.set('n', '<leader>cr', builtin.lsp_references, { desc = 'Telescope lsp references' })
vim.keymap.set('n', '<leader>cs', builtin.treesitter, { desc = 'Telescope treesitter' })
vim.keymap.set("n", "<leader>ct", function()
vim.cmd [[Trouble diagnostics]]
end, { desc = "Run Trouble Diagnostics" })
vim.keymap.set('n', '<leader>cR', function()
vim.lsp.buf.rename()
end, {desc = "LSP Rename"})
-- file finding
vim.keymap.set('n', '<leader>pf', builtin.find_files, { desc = 'Telescope find in project' })
@@ -85,14 +103,22 @@ return {
-- buffers
vim.keymap.set('n', '<leader>bb', builtin.buffers, { desc = 'Telescope buffers' })
vim.keymap.set('n', '<leader>bd', function()
vim.cmd [[bd]]
vim.cmd [[Bd]]
end, { desc = 'Save and close' })
vim.keymap.set('n', ']b', function()
vim.cmd [[bnext]]
end, {desc = 'Next buffer'})
vim.keymap.set('n', '[b', function()
vim.cmd [[bprev]]
end, {desc = 'Next buffer'})
end, {desc = 'Prev buffer'})
-- jump quicklist
vim.keymap.set('n', ']c', function()
vim.cmd [[cnext]]
end, {desc = 'Next Quicklist'})
vim.keymap.set('n', '[c', function()
vim.cmd [[cprev]]
end, {desc = 'Prev Quicklist'})
end
}, {
"folke/trouble.nvim",
@@ -103,5 +129,125 @@ return {
config = function()
vim.keymap.set({ "v", "n" }, "<leader>ca", require("actions-preview").code_actions, { desc = "Telescope code actions"})
end,
}, {
"famiu/bufdelete.nvim"
}, {
"yetone/avante.nvim",
event = 'VeryLazy',
lazy = false,
dependencies = {
"stevearc/dressing.nvim",
"nvim-lua/plenary.nvim",
"MunifTanjim/nui.nvim",
},
opts = {
provider = "dsv3",
auto_suggestions_provider = "codestral",
-- cursor_applying_provider = "yoqwen32",
-- behaviour = {
-- enable_cursor_planning_mode = true, -- enable cursor planning mode!
-- },
file_selector = {
provider = "telescope",
provider_opts = {},
},
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 = {
__inherited_from = "openai",
api_key_name = "YOSTAR_API_KEY",
endpoint = "https://litellm.yostar.net",
model = "DeepSeek-R1",
disable_tools = true,
},
yochat = {
__inherited_from = "openai",
api_key_name = "YOSTAR_API_KEY",
endpoint = "https://litellm.yostar.net",
model = "DeepSeek-V3",
disable_tools = true,
max_completion_tokens = 12288,
},
yoqwq32 = {
__inherited_from = "openai",
api_key_name = "YOSTAR_API_KEY",
endpoint = "https://litellm.yostar.net",
model = "qwq-32b",
disable_tools = true,
},
codestral = {
__inherited_from = 'openai',
api_key_name = 'CODESTRAL_API_KEY',
endpoint = 'https://codestral.mistral.ai/v1',
model = 'codestral-latest'
}
},
}
}, {
'hat0uma/csvview.nvim',
config = function()
vim.api.nvim_create_autocmd('FileType', {
pattern = 'csv',
command = 'CsvViewEnable'
})
require('csvview').setup{
parser = {comments = {"#", "//"}},
keymaps = {
-- Text objects for selecting fields
textobject_field_inner = { "if", mode = { "o", "x" } },
textobject_field_outer = { "af", mode = { "o", "x" } },
-- Excel-like navigation:
-- Use <Tab> and <S-Tab> to move horizontally between fields.
-- Use <Enter> and <S-Enter> to move vertically between rows and place the cursor at the end of the field.
-- Note: In terminals, you may need to enable CSI-u mode to use <S-Tab> and <S-Enter>.
jump_next_field_end = { "<Tab>", mode = { "n", "v" } },
jump_prev_field_end = { "<S-Tab>", mode = { "n", "v" } },
jump_next_row = { "<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
}
}
+30 -2
View File
@@ -9,6 +9,7 @@ return {
settings = {
complete_function_calls = true,
},
root_dir = lspconfig.util.root_pattern("package.json"),
single_file_support = false,
})
@@ -27,10 +28,18 @@ return {
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-path",
"SirVer/ultisnips",
"quangnguyen30192/cmp-nvim-ultisnips"
},
config = function()
local cmp = require('cmp')
local cmp_ultisnips_mappings = require("cmp_nvim_ultisnips.mappings")
cmp.setup({
snippet = {
expand = function(args)
vim.fn["UltiSnips#Anon"](args.body)
end
},
completion = {
keyword_length = 1,
max_item_count = 6
@@ -39,11 +48,27 @@ return {
{ name = "nvim_lsp", keyword_length = 1, max_item_count = 6 },
{ name = "buffer", keyword_length = 1, max_item_count = 6 },
{ name = "path", keyword_length = 1, max_item_count = 6 },
{ name = "ultisnips" },
},
mapping = {
['<C-n>'] = cmp.mapping(cmp.mapping.select_next_item(), {'i', 'c'}),
['<C-p>'] = cmp.mapping(cmp.mapping.select_prev_item(), {'i', 'c'}),
['<CR>'] = cmp.mapping.confirm({ select = true }), -- accept currently selected item
['<C-b>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),
['<C-e>'] = cmp.mapping.abort(),
["<Tab>"] = cmp.mapping(
function(fallback)
cmp_ultisnips_mappings.expand_or_jump_forwards(fallback)
end,
{ "i", "s" }
),
["<S-Tab>"] = cmp.mapping(
function(fallback)
cmp_ultisnips_mappings.jump_backwards(fallback)
end,
{ "i", "s" }
),
},
sorting = {
comparators = {
@@ -64,8 +89,11 @@ return {
}
lspconfig.denols.setup{
single_file_support = false,
root_dir = require('lspconfig.util').root_pattern("deno.json", "deno.jsonc")
root_dir = lspconfig.util.root_pattern("deno.json", "deno.jsonc")
}
lspconfig.marksman.setup{
capabilities = capabilities
}
end
},{
"nvim-treesitter/nvim-treesitter",
@@ -74,7 +102,7 @@ return {
local configs = require("nvim-treesitter.configs")
configs.setup({
ensure_installed = { "tsx", "typescript", "javascript", "html", "markdown" },
ensure_installed = { "tsx", "typescript", "javascript", "html", "markdown", "c_sharp" },
sync_install = false,
highlight = { enable = true },
indent = { enable = true },
+10 -4
View File
@@ -56,17 +56,17 @@ return {
end
-- navigation
map('n', ']c', function()
map('n', ']h', function()
if vim.wo.diff then
vim.cmd.normal({']c', bang = true})
vim.cmd.normal({']h', bang = true})
else
gitsigns.nav_hunk('next')
end
end, {desc = "Next Git Hunk"})
map('n', '[c', function()
map('n', '[h', function()
if vim.wo.diff then
vim.cmd.normal({'[c', bang = true})
vim.cmd.normal({'[h', bang = true})
else
gitsigns.nav_hunk('prev')
end
@@ -79,5 +79,11 @@ return {
end
}
end
},{
'MeanderingProgrammer/render-markdown.nvim',
dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
---@module 'render-markdown'
---@type render.md.UserConfig
opts = {},
}
}