addet a important keympap <C-s> and also addet ai cmp (but idk if it works..)
This commit is contained in:
pika
parent
31a0f94839
commit
a0a00abfc5
2 changed files with 133 additions and 72 deletions
|
|
@ -53,6 +53,7 @@ map("n", "<leader>k", "<C-w><C-k>", { desc = "Move focus to the upper window" })
|
||||||
-- map("n", "<leader>p", vim.cmd.Ex)
|
-- map("n", "<leader>p", vim.cmd.Ex)
|
||||||
map("n", "<leader>q", vim.cmd.q)
|
map("n", "<leader>q", vim.cmd.q)
|
||||||
map("n", "<leader>s", vim.cmd.w)
|
map("n", "<leader>s", vim.cmd.w)
|
||||||
|
map("n", "<C-s>", vim.cmd.w)
|
||||||
|
|
||||||
-- ─< rename word under cursor >───────────────────────────────────────────────────────────
|
-- ─< rename word under cursor >───────────────────────────────────────────────────────────
|
||||||
map("n", "<leader>R", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
|
map("n", "<leader>R", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
|
||||||
|
|
|
||||||
|
|
@ -1,79 +1,139 @@
|
||||||
return {
|
return {
|
||||||
"hrsh7th/nvim-cmp",
|
{
|
||||||
event = "InsertEnter",
|
"hrsh7th/nvim-cmp",
|
||||||
dependencies = {
|
event = "InsertEnter",
|
||||||
"hrsh7th/cmp-buffer", -- source for text in buffer
|
dependencies = {
|
||||||
"hrsh7th/cmp-path", -- source for file system paths
|
"hrsh7th/cmp-buffer", -- source for text in buffer
|
||||||
{
|
"hrsh7th/cmp-path", -- source for file system paths
|
||||||
"L3MON4D3/LuaSnip",
|
{
|
||||||
version = "v2.*", -- latest release of LuaSnip
|
"L3MON4D3/LuaSnip",
|
||||||
build = "make install_jsregexp", -- optional regex support for LuaSnip
|
version = "v2.*", -- latest release of LuaSnip
|
||||||
|
build = "make install_jsregexp", -- optional regex support for LuaSnip
|
||||||
|
},
|
||||||
|
"saadparwaiz1/cmp_luasnip", -- for autocompletion
|
||||||
|
"rafamadriz/friendly-snippets", -- useful snippets
|
||||||
|
"onsails/lspkind.nvim", -- vs-code like pictograms
|
||||||
},
|
},
|
||||||
"saadparwaiz1/cmp_luasnip", -- for autocompletion
|
config = function()
|
||||||
"rafamadriz/friendly-snippets", -- useful snippets
|
local cmp = require("cmp")
|
||||||
"onsails/lspkind.nvim", -- vs-code like pictograms
|
local luasnip = require("luasnip")
|
||||||
},
|
local lspkind = require("lspkind")
|
||||||
config = function()
|
|
||||||
local cmp = require("cmp")
|
|
||||||
local luasnip = require("luasnip")
|
|
||||||
local lspkind = require("lspkind")
|
|
||||||
|
|
||||||
-- Load snippets from friendly-snippets and custom directory
|
-- Load snippets from friendly-snippets and custom directory
|
||||||
require("luasnip.loaders.from_vscode").lazy_load()
|
require("luasnip.loaders.from_vscode").lazy_load()
|
||||||
require("luasnip.loaders.from_vscode").lazy_load({ paths = { "~/.config/nvim/snippets" } })
|
require("luasnip.loaders.from_vscode").lazy_load({ paths = { "~/.config/nvim/snippets" } })
|
||||||
|
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
completion = {
|
completion = {
|
||||||
completeopt = "menu,menuone,preview,noselect",
|
completeopt = "menu,menuone,preview,noselect",
|
||||||
},
|
},
|
||||||
snippet = {
|
snippet = {
|
||||||
expand = function(args)
|
expand = function(args)
|
||||||
luasnip.lsp_expand(args.body)
|
luasnip.lsp_expand(args.body)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
mapping = cmp.mapping.preset.insert({
|
mapping = cmp.mapping.preset.insert({
|
||||||
["<C-k>"] = cmp.mapping.select_prev_item(), -- previous suggestion
|
-- ["<C-x>"] = cmp.mapping({
|
||||||
["<C-j>"] = cmp.mapping.select_next_item(), -- next suggestion
|
-- cmp.mapping.complete({
|
||||||
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
-- config = {
|
||||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
-- sources = cmp.config.sources({
|
||||||
["<C-Space>"] = cmp.mapping.complete(), -- show completion suggestions
|
-- { name = "cmp_ai" },
|
||||||
["<C-e>"] = cmp.mapping.abort(), -- close completion window
|
-- }),
|
||||||
["<CR>"] = cmp.mapping.confirm({ select = false }),
|
-- },
|
||||||
|
-- }),
|
||||||
|
-- { "i" },
|
||||||
|
-- }),
|
||||||
|
|
||||||
-- Tab to complete
|
["<C-k>"] = cmp.mapping.select_prev_item(), -- previous suggestion
|
||||||
["<Tab>"] = cmp.mapping(function(fallback)
|
["<C-j>"] = cmp.mapping.select_next_item(), -- next suggestion
|
||||||
if cmp.visible() then
|
["<C-b>"] = cmp.mapping.scroll_docs(-4),
|
||||||
cmp.confirm({ select = true }) -- confirm selection
|
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||||
elseif luasnip.expand_or_jumpable() then
|
["<C-Space>"] = cmp.mapping.complete(), -- show completion suggestions
|
||||||
luasnip.expand_or_jump()
|
["<C-e>"] = cmp.mapping.abort(), -- close completion window
|
||||||
else
|
["<CR>"] = cmp.mapping.confirm({ select = false }),
|
||||||
fallback()
|
|
||||||
end
|
-- Tab to complete
|
||||||
end, { "i", "s" }),
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
}),
|
if cmp.visible() then
|
||||||
-- sources for autocompletion
|
cmp.confirm({ select = true }) -- confirm selection
|
||||||
sources = cmp.config.sources({
|
elseif luasnip.expand_or_jumpable() then
|
||||||
{ name = "nvim_lsp" },
|
luasnip.expand_or_jump()
|
||||||
{ name = "luasnip" }, -- snippets
|
else
|
||||||
{ name = "buffer" }, -- text within current buffer
|
fallback()
|
||||||
{ name = "path" }, -- file system paths
|
end
|
||||||
}),
|
end, { "i", "s" }),
|
||||||
-- configure lspkind for vs-code like pictograms in completion menu
|
|
||||||
formatting = {
|
|
||||||
format = lspkind.cmp_format({
|
|
||||||
mode = "symbol_text", -- show symbol text with icons
|
|
||||||
maxwidth = 130,
|
|
||||||
ellipsis_char = "...",
|
|
||||||
}),
|
}),
|
||||||
},
|
-- sources for autocompletion
|
||||||
-- Enable rounded borders
|
sources = cmp.config.sources({
|
||||||
window = {
|
{ name = "nvim_lsp" },
|
||||||
completion = cmp.config.window.bordered(),
|
{ name = "luasnip" }, -- snippets
|
||||||
documentation = cmp.config.window.bordered(),
|
{ name = "buffer" }, -- text within current buffer
|
||||||
},
|
{ name = "path" }, -- file system paths
|
||||||
experimental = {
|
{ name = "cmp_ai" }, -- AI completion
|
||||||
ghost_text = true, -- This enables the inline ghost text
|
}),
|
||||||
},
|
-- configure lspkind for vs-code like pictograms in completion menu
|
||||||
})
|
formatting = {
|
||||||
end,
|
format = lspkind.cmp_format({
|
||||||
|
mode = "symbol_text", -- show symbol text with icons
|
||||||
|
maxwidth = 130,
|
||||||
|
ellipsis_char = "...",
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
-- Enable rounded borders
|
||||||
|
window = {
|
||||||
|
completion = cmp.config.window.bordered(),
|
||||||
|
documentation = cmp.config.window.bordered(),
|
||||||
|
},
|
||||||
|
experimental = {
|
||||||
|
ghost_text = true, -- This enables the inline ghost text
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
-- ─< for ai use >──────────────────────────────────────────────────────────────────────
|
||||||
|
"tzachar/cmp-ai",
|
||||||
|
dependencies = {
|
||||||
|
"hrsh7th/nvim-cmp",
|
||||||
|
"tzachar/cmp-ai",
|
||||||
|
},
|
||||||
|
|
||||||
|
config = function()
|
||||||
|
local cmp = require("cmp")
|
||||||
|
local cmp_ai = require("cmp_ai.config")
|
||||||
|
|
||||||
|
-- Setup cmp-ai configuration
|
||||||
|
cmp_ai:setup({
|
||||||
|
max_lines = 100,
|
||||||
|
provider = "Ollama",
|
||||||
|
-- provider_options = {
|
||||||
|
-- model = "codellama:7b-code",
|
||||||
|
-- auto_unload = false,
|
||||||
|
-- raw_response_cb = function(response)
|
||||||
|
-- vim.notify(vim.inspect(response))
|
||||||
|
-- vim.g.ai_raw_response = response
|
||||||
|
-- end,
|
||||||
|
-- },
|
||||||
|
provider_options = {
|
||||||
|
model = "qwen2.5-coder:7b-base-q6_K",
|
||||||
|
prompt = function(lines_before, lines_after)
|
||||||
|
return "<|fim_prefix|>" .. lines_before .. "<|fim_suffix|>" .. lines_after .. "<|fim_middle|>"
|
||||||
|
end,
|
||||||
|
raw_response_cb = function(response)
|
||||||
|
vim.notify(vim.inspect(response))
|
||||||
|
vim.g.ai_raw_response = response
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
notify = true,
|
||||||
|
notify_callback = function(msg)
|
||||||
|
vim.notify(msg)
|
||||||
|
end,
|
||||||
|
run_on_every_keystroke = true,
|
||||||
|
ignored_file_types = {
|
||||||
|
txt = true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue