Compare commits
47
Commits
0ebe6682b3
..
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 | ||
|
|
2ce4a97439 | ||
|
|
ddab026923 | ||
|
|
c8db1bda9b | ||
|
|
63f4119678 | ||
|
|
0cc45c6281 | ||
|
|
7d5dcc7660 | ||
|
|
cc8ae3ad3e | ||
|
|
f155486d78 | ||
|
|
c685c045bb | ||
|
|
efd25f8418 | ||
|
|
797f129916 | ||
|
|
1c1ede62b4 | ||
|
|
c5dece31ac |
@@ -7,6 +7,10 @@ else
|
|||||||
require("config.lazy")
|
require("config.lazy")
|
||||||
end
|
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.guifont="FiraCode Nerd Font Mono,Microsoft YaHei,微软雅黑:h12"
|
||||||
|
|
||||||
vim.opt.clipboard = 'unnamedplus'
|
vim.opt.clipboard = 'unnamedplus'
|
||||||
|
|||||||
+32
-24
@@ -1,29 +1,37 @@
|
|||||||
{
|
{
|
||||||
"actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" },
|
"actions-preview.nvim": { "branch": "master", "commit": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2" },
|
||||||
"bufferline.nvim": { "branch": "main", "commit": "5c528bee3dd797d5bd6bae5f229411939b25b203" },
|
"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-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" },
|
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||||
"conform.nvim": { "branch": "master", "commit": "278376b953bcab65e2ab9508b5575d1f9a2cbac1" },
|
"conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" },
|
||||||
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
|
"csvview.nvim": { "branch": "main", "commit": "7dcb6aa2965a1d5555d4940ed0c9c2f0e173ecdb" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" },
|
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
||||||
"grug-far.nvim": { "branch": "main", "commit": "190c03d54e8976491e6e49acb97087bf4182b079" },
|
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
|
||||||
"kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" },
|
"gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
|
"grug-far.nvim": { "branch": "main", "commit": "bdcdeed04ea3d49c25036235d027ade401df9c9d" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
|
"kanagawa.nvim": { "branch": "master", "commit": "709018d5af92d2e5780bfb8a6d36e9cad01a6402" },
|
||||||
"mini.ai": { "branch": "main", "commit": "40e380a589d07ec2c856940c6422aafe5d949a0d" },
|
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||||
"mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" },
|
"lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" },
|
||||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
|
"mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
|
||||||
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
|
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" },
|
"neo-tree.nvim": { "branch": "v3.x", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "85afd4b936acd62b578c2e2d8e86541fb972c32e" },
|
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
|
||||||
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
|
"nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "f6c5a58e3bbbedd2a31d04e5aa6f9997df20e3df" },
|
"nvim-lspconfig": { "branch": "master", "commit": "200280dab91a7df2ca42fd2ab3cb4c5fab056666" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
|
"nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
"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" },
|
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
|
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" },
|
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||||
"typescript-tools.nvim": { "branch": "master", "commit": "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7" },
|
"typescript-tools.nvim": { "branch": "master", "commit": "35e397ce467bedbbbb5bfcd0aa79727b59a08d4a" },
|
||||||
"which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }
|
"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
|
||||||
|
}
|
||||||
|
}
|
||||||
+154
-7
@@ -31,6 +31,16 @@ return {
|
|||||||
vim.keymap.set("n", "<leader>e", function()
|
vim.keymap.set("n", "<leader>e", function()
|
||||||
vim.cmd [[Neotree reveal]]
|
vim.cmd [[Neotree reveal]]
|
||||||
end, { desc = "Run Neotree" })
|
end, { desc = "Run Neotree" })
|
||||||
|
|
||||||
|
require'neo-tree'.setup {
|
||||||
|
filesystem = {
|
||||||
|
filtered_items = {
|
||||||
|
hide_by_pattern = {
|
||||||
|
"*.meta"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
end
|
end
|
||||||
}, {
|
}, {
|
||||||
'MagicDuck/grug-far.nvim',
|
'MagicDuck/grug-far.nvim',
|
||||||
@@ -41,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",
|
||||||
@@ -59,9 +69,12 @@ return {
|
|||||||
local utils = require('telescope.utils')
|
local utils = require('telescope.utils')
|
||||||
|
|
||||||
-- generic
|
-- generic
|
||||||
vim.keymap.set('n', '<leader>l', 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>h', builtin.help_tags, { desc = 'Telescope help tags' })
|
vim.keymap.set('n', '<leader>td', builtin.lsp_document_symbols, { desc = 'Telescope document symbols' })
|
||||||
vim.keymap.set('n', '<leader>t', function()
|
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]]
|
vim.cmd [[TodoTelescope]]
|
||||||
end, { desc = 'Telescope Todo' })
|
end, { desc = 'Telescope Todo' })
|
||||||
|
|
||||||
@@ -69,6 +82,12 @@ return {
|
|||||||
vim.keymap.set('n', '<leader>cd', builtin.diagnostics, { desc = 'Telescope diagnostics' })
|
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>cr', builtin.lsp_references, { desc = 'Telescope lsp references' })
|
||||||
vim.keymap.set('n', '<leader>cs', builtin.treesitter, { desc = 'Telescope treesitter' })
|
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
|
-- file finding
|
||||||
vim.keymap.set('n', '<leader>pf', builtin.find_files, { desc = 'Telescope find in project' })
|
vim.keymap.set('n', '<leader>pf', builtin.find_files, { desc = 'Telescope find in project' })
|
||||||
@@ -84,14 +103,22 @@ return {
|
|||||||
-- buffers
|
-- buffers
|
||||||
vim.keymap.set('n', '<leader>bb', builtin.buffers, { desc = 'Telescope buffers' })
|
vim.keymap.set('n', '<leader>bb', builtin.buffers, { desc = 'Telescope buffers' })
|
||||||
vim.keymap.set('n', '<leader>bd', function()
|
vim.keymap.set('n', '<leader>bd', function()
|
||||||
vim.cmd [[bd]]
|
vim.cmd [[Bd]]
|
||||||
end, { desc = 'Save and close' })
|
end, { desc = 'Save and close' })
|
||||||
vim.keymap.set('n', ']b', function()
|
vim.keymap.set('n', ']b', function()
|
||||||
vim.cmd [[bnext]]
|
vim.cmd [[bnext]]
|
||||||
end, {desc = 'Next buffer'})
|
end, {desc = 'Next buffer'})
|
||||||
vim.keymap.set('n', '[b', function()
|
vim.keymap.set('n', '[b', function()
|
||||||
vim.cmd [[bprev]]
|
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
|
end
|
||||||
}, {
|
}, {
|
||||||
"folke/trouble.nvim",
|
"folke/trouble.nvim",
|
||||||
@@ -102,5 +129,125 @@ return {
|
|||||||
config = function()
|
config = function()
|
||||||
vim.keymap.set({ "v", "n" }, "<leader>ca", require("actions-preview").code_actions, { desc = "Telescope code actions"})
|
vim.keymap.set({ "v", "n" }, "<leader>ca", require("actions-preview").code_actions, { desc = "Telescope code actions"})
|
||||||
end,
|
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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+43
-5
@@ -9,6 +9,7 @@ return {
|
|||||||
settings = {
|
settings = {
|
||||||
complete_function_calls = true,
|
complete_function_calls = true,
|
||||||
},
|
},
|
||||||
|
root_dir = lspconfig.util.root_pattern("package.json"),
|
||||||
single_file_support = false,
|
single_file_support = false,
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -27,10 +28,18 @@ return {
|
|||||||
"hrsh7th/cmp-nvim-lsp",
|
"hrsh7th/cmp-nvim-lsp",
|
||||||
"hrsh7th/cmp-buffer",
|
"hrsh7th/cmp-buffer",
|
||||||
"hrsh7th/cmp-path",
|
"hrsh7th/cmp-path",
|
||||||
|
"SirVer/ultisnips",
|
||||||
|
"quangnguyen30192/cmp-nvim-ultisnips"
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
local cmp = require('cmp')
|
local cmp = require('cmp')
|
||||||
|
local cmp_ultisnips_mappings = require("cmp_nvim_ultisnips.mappings")
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
|
snippet = {
|
||||||
|
expand = function(args)
|
||||||
|
vim.fn["UltiSnips#Anon"](args.body)
|
||||||
|
end
|
||||||
|
},
|
||||||
completion = {
|
completion = {
|
||||||
keyword_length = 1,
|
keyword_length = 1,
|
||||||
max_item_count = 6
|
max_item_count = 6
|
||||||
@@ -39,12 +48,37 @@ return {
|
|||||||
{ name = "nvim_lsp", keyword_length = 1, max_item_count = 6 },
|
{ name = "nvim_lsp", keyword_length = 1, max_item_count = 6 },
|
||||||
{ name = "buffer", 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 = "path", keyword_length = 1, max_item_count = 6 },
|
||||||
|
{ name = "ultisnips" },
|
||||||
},
|
},
|
||||||
mapping = {
|
mapping = {
|
||||||
['<C-n>'] = cmp.mapping(cmp.mapping.select_next_item(), {'i', 'c'}),
|
['<C-n>'] = cmp.mapping(cmp.mapping.select_next_item(), {'i', 'c'}),
|
||||||
['<C-p>'] = cmp.mapping(cmp.mapping.select_prev_item(), {'i', 'c'}),
|
['<C-p>'] = cmp.mapping(cmp.mapping.select_prev_item(), {'i', 'c'}),
|
||||||
['<CR>'] = cmp.mapping.confirm({ select = true }), -- accept currently selected item
|
['<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 = {
|
||||||
|
cmp.config.compare.offset,
|
||||||
|
cmp.config.compare.exact,
|
||||||
|
cmp.config.compare.score,
|
||||||
|
cmp.config.compare.recently_used,
|
||||||
|
cmp.config.compare.kind,
|
||||||
|
},
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
@@ -53,9 +87,13 @@ return {
|
|||||||
lspconfig.cssls.setup {
|
lspconfig.cssls.setup {
|
||||||
capabilities = capabilities
|
capabilities = capabilities
|
||||||
}
|
}
|
||||||
-- lspconfig.denols.setup{
|
lspconfig.denols.setup{
|
||||||
-- single_file_support = false,
|
single_file_support = false,
|
||||||
-- }
|
root_dir = lspconfig.util.root_pattern("deno.json", "deno.jsonc")
|
||||||
|
}
|
||||||
|
lspconfig.marksman.setup{
|
||||||
|
capabilities = capabilities
|
||||||
|
}
|
||||||
end
|
end
|
||||||
},{
|
},{
|
||||||
"nvim-treesitter/nvim-treesitter",
|
"nvim-treesitter/nvim-treesitter",
|
||||||
@@ -64,7 +102,7 @@ return {
|
|||||||
local configs = require("nvim-treesitter.configs")
|
local configs = require("nvim-treesitter.configs")
|
||||||
|
|
||||||
configs.setup({
|
configs.setup({
|
||||||
ensure_installed = { "tsx", "typescript", "javascript", "html" },
|
ensure_installed = { "tsx", "typescript", "javascript", "html", "markdown", "c_sharp" },
|
||||||
sync_install = false,
|
sync_install = false,
|
||||||
highlight = { enable = true },
|
highlight = { enable = true },
|
||||||
indent = { enable = true },
|
indent = { enable = true },
|
||||||
|
|||||||
+39
-1
@@ -45,7 +45,45 @@ return {
|
|||||||
},{
|
},{
|
||||||
"lewis6991/gitsigns.nvim",
|
"lewis6991/gitsigns.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require('gitsigns').setup()
|
require('gitsigns').setup{
|
||||||
|
on_attach = function(bufnr)
|
||||||
|
local gitsigns = require('gitsigns')
|
||||||
|
|
||||||
|
local function map(mode, l, r, opts)
|
||||||
|
opts = opts or {}
|
||||||
|
opts.buffer = bufnr
|
||||||
|
vim.keymap.set(mode, l, r, opts)
|
||||||
|
end
|
||||||
|
|
||||||
|
-- navigation
|
||||||
|
map('n', ']h', function()
|
||||||
|
if vim.wo.diff then
|
||||||
|
vim.cmd.normal({']h', bang = true})
|
||||||
|
else
|
||||||
|
gitsigns.nav_hunk('next')
|
||||||
|
end
|
||||||
|
end, {desc = "Next Git Hunk"})
|
||||||
|
|
||||||
|
map('n', '[h', function()
|
||||||
|
if vim.wo.diff then
|
||||||
|
vim.cmd.normal({'[h', bang = true})
|
||||||
|
else
|
||||||
|
gitsigns.nav_hunk('prev')
|
||||||
|
end
|
||||||
|
end, {desc = "Prev Git Hunk"})
|
||||||
|
|
||||||
|
map('n', '<leader>hs', gitsigns.stage_hunk)
|
||||||
|
map('n', '<leader>hr', gitsigns.reset_hunk)
|
||||||
|
map('v', '<leader>hs', function() gitsigns.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
|
||||||
|
map('v', '<leader>hr', function() gitsigns.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
|
||||||
end
|
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 = {},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user