Update with main #1
3 changed files with 38 additions and 16 deletions
|
@ -1,6 +1,6 @@
|
||||||
# My [AstroNvim](https://github.com/AstroNvim/AstroNvim) config
|
# My [AstroNvim](https://github.com/AstroNvim/AstroNvim) config
|
||||||
|
|
||||||
## How to install my config on merlin
|
## How to install my config on merli
|
||||||
|
|
||||||
- First you have to install AstroNvim
|
- First you have to install AstroNvim
|
||||||
- Backup your previous nvim config
|
- Backup your previous nvim config
|
||||||
|
|
27
init.lua
27
init.lua
|
@ -1,3 +1,6 @@
|
||||||
|
local cmp = require('cmp')
|
||||||
|
-- Never gonna give you up
|
||||||
|
-- Never gonna
|
||||||
-- AstroNvim Configuration Table
|
-- AstroNvim Configuration Table
|
||||||
-- All configuration changes should go inside of the table below
|
-- All configuration changes should go inside of the table below
|
||||||
|
|
||||||
|
@ -272,7 +275,7 @@ local config = {
|
||||||
-- ["<esc>"] = false,
|
-- ["<esc>"] = false,
|
||||||
},
|
},
|
||||||
i = {
|
i = {
|
||||||
["<C-e>"] = { "copilot#Accept('<CR>')", silent = true, expr = true },
|
-- ["<Tab>"] = { "copilot#Accept('<CR>')", silent = true, expr = true },
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -293,23 +296,23 @@ local config = {
|
||||||
-- end,
|
-- end,
|
||||||
-- },
|
-- },
|
||||||
--
|
--
|
||||||
-- { "github/copilot.vim" },
|
{
|
||||||
|
"folke/todo-comments.nvim",
|
||||||
|
event = "BufRead",
|
||||||
|
config = function()
|
||||||
|
require("todo-comments").setup()
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
{ "github/copilot.vim" },
|
||||||
{ "puremourning/vimspector" },
|
{ "puremourning/vimspector" },
|
||||||
{ "lervag/vimtex" },
|
{ "lervag/vimtex" },
|
||||||
-- { "normen/vim-pio" },
|
|
||||||
-- {
|
|
||||||
-- "iamcco/markdown-preview.nvim",
|
|
||||||
-- run = function() vim.fn["mkdp#util#install"]() end,
|
|
||||||
-- },
|
|
||||||
{
|
{
|
||||||
"Pocco81/auto-save.nvim",
|
"Pocco81/auto-save.nvim",
|
||||||
config = function()
|
config = function()
|
||||||
require("auto-save").setup()
|
require("auto-save").setup()
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
-- { "weirongxu/plantuml-previewer.vim" },
|
|
||||||
{ "aklt/plantuml-syntax" },
|
{ "aklt/plantuml-syntax" },
|
||||||
-- { "tyru/open-browser.vim" },
|
|
||||||
|
|
||||||
-- We also support a key value style plugin definition similar to NvChad:
|
-- We also support a key value style plugin definition similar to NvChad:
|
||||||
-- ["ray-x/lsp_signature.nvim"] = {
|
-- ["ray-x/lsp_signature.nvim"] = {
|
||||||
|
@ -318,12 +321,6 @@ local config = {
|
||||||
-- require("lsp_signature").setup()
|
-- require("lsp_signature").setup()
|
||||||
-- end,
|
-- end,
|
||||||
-- },
|
-- },
|
||||||
-- ["weirongxu/plantuml-previewer.vim"] = {
|
|
||||||
-- requires = { {"aklt/plantuml-syntax"} },
|
|
||||||
-- -- depends = "aklt/plantuml-syntax",
|
|
||||||
-- requires = { {"tyru/open-browser.vim"} },
|
|
||||||
-- -- depends = "tyru/open-browser.vim",
|
|
||||||
-- },
|
|
||||||
|
|
||||||
},
|
},
|
||||||
-- All other entries override the require("<key>").setup({...}) call for default plugins
|
-- All other entries override the require("<key>").setup({...}) call for default plugins
|
||||||
|
|
25
plugins/cmp.lua
Normal file
25
plugins/cmp.lua
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
local cmp = require "cmp"
|
||||||
|
local luasnip = require "luasnip"
|
||||||
|
return {
|
||||||
|
preselect = cmp.PreselectMode.None,
|
||||||
|
mapping = {
|
||||||
|
["<CR>"] = cmp.mapping.confirm { select = false },
|
||||||
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
|
vim.api.nvim_feedkeys(vim.fn['copilot#Accept'](vim.api.nvim_replace_termcodes('<Tab>', true, true, true)), 'n',
|
||||||
|
true)
|
||||||
|
end)
|
||||||
|
-- if luasnip.expandable() then
|
||||||
|
-- luasnip.expand()
|
||||||
|
-- elseif luasnip.expand_or_jumpable() then
|
||||||
|
-- luasnip.expand_or_jump()
|
||||||
|
-- fallback()
|
||||||
|
-- end
|
||||||
|
-- end, {
|
||||||
|
-- "i",
|
||||||
|
-- "s",
|
||||||
|
-- }),
|
||||||
|
},
|
||||||
|
experimental = {
|
||||||
|
ghost_text = false -- this feature conflict with copilot.vim's preview.
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue