Compare commits
34
Commits
2ce4a97439
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5eb1a16f7 | ||
|
|
d687614de9 | ||
|
|
038b342eec | ||
|
|
86230438e5 | ||
|
|
8ec7a97bd4 | ||
|
|
c0238ab67c | ||
|
|
8f3bfa6fe8 | ||
|
|
dcacd05054 | ||
|
|
074e8ec3b0 | ||
|
|
4fd10f828e | ||
|
|
ffde2ccc24 | ||
|
|
f56ee816cd | ||
|
|
cb3c621541 | ||
|
|
81343d4d3c | ||
|
|
889ae2623e | ||
|
|
dac0928a6f | ||
|
|
22f9eeab6f | ||
|
|
624a782ddd | ||
|
|
71174b22c7 | ||
|
|
4adc633f0c | ||
|
|
cb7a183ce4 | ||
|
|
1f5668382c | ||
|
|
4164174c1a | ||
|
|
b0279980c3 | ||
|
|
ea495f8181 | ||
|
|
9bd2925161 | ||
|
|
b17fe062d5 | ||
|
|
36671c6599 | ||
|
|
e5e9d292e9 | ||
|
|
9dcc2629ac | ||
|
|
562070873a | ||
|
|
66a753cd9d | ||
|
|
c84e45ad0c | ||
|
|
dc9ef486f0 |
@@ -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'
|
||||
|
||||
+28
-26
@@ -1,35 +1,37 @@
|
||||
{
|
||||
"actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" },
|
||||
"avante.nvim": { "branch": "main", "commit": "f7b51730dff93bd24c077f9243ae8d9f298b2266" },
|
||||
"actions-preview.nvim": { "branch": "master", "commit": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2" },
|
||||
"avante.nvim": { "branch": "main", "commit": "39787969c769204861f1339e52ffcdd00e648220" },
|
||||
"bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "5726c4e291224181903e960119a11e20ac677a0a" },
|
||||
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"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": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" },
|
||||
"dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
|
||||
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
|
||||
"grug-far.nvim": { "branch": "main", "commit": "08f32182335754abf461dfb77b2c4e24bfe4d614" },
|
||||
"kanagawa.nvim": { "branch": "master", "commit": "18ae5771b22d8f913ef541c827a8180b4cb12c8a" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "72aa3a2624be5dc240646084f7b6a38eb99eb2ce" },
|
||||
"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": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "f4ed656e876e45cf914d7beb972830561178e232" },
|
||||
"nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "556ac68cd33973a38d3f2abac47f361432593fe2" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
||||
"render-markdown.nvim": { "branch": "main", "commit": "16369540a005ad0cf267498162aedca6dfca1b9c" },
|
||||
"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": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
|
||||
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||
"typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" },
|
||||
"ultisnips": { "branch": "master", "commit": "49dc8cb2086db19d385791c8e1635723b0fd95c7" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }
|
||||
"ultisnips": { "branch": "master", "commit": "dbc458e110bb49299da76ec53f8b09b4f6dce28a" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
return {
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
config = function()
|
||||
local lspconfig = require('lspconfig')
|
||||
lspconfig.csharp_ls.setup {}
|
||||
end
|
||||
}
|
||||
}
|
||||
+131
-16
@@ -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' })
|
||||
@@ -117,22 +135,119 @@ return {
|
||||
"yetone/avante.nvim",
|
||||
event = 'VeryLazy',
|
||||
lazy = false,
|
||||
build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false",
|
||||
dependencies = {
|
||||
"stevearc/dressing.nvim",
|
||||
"nvim-lua/plenary.nvim",
|
||||
"MunifTanjim/nui.nvim",
|
||||
},
|
||||
opts = {
|
||||
provider = "openai",
|
||||
auto_suggestions_provider = "openai",
|
||||
openai = {
|
||||
endpoint = "https://api.deepseek.com/v1",
|
||||
model = "deepseek-chat",
|
||||
timeout = 30000,
|
||||
temperature = 0,
|
||||
max_tokens = 4096,
|
||||
},
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ return {
|
||||
settings = {
|
||||
complete_function_calls = true,
|
||||
},
|
||||
root_dir = lspconfig.util.root_pattern("package.json"),
|
||||
single_file_support = false,
|
||||
})
|
||||
|
||||
@@ -88,7 +89,7 @@ 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
|
||||
@@ -101,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 },
|
||||
|
||||
Reference in New Issue
Block a user