Skip to content

Commit

Permalink
BLINK I TRUST YOU AGAIN
Browse files Browse the repository at this point in the history
  • Loading branch information
philosofonusus committed Dec 19, 2024
1 parent 09db12b commit 519239c
Show file tree
Hide file tree
Showing 7 changed files with 202 additions and 202 deletions.
166 changes: 85 additions & 81 deletions lua/plugins/blink.lua
Original file line number Diff line number Diff line change
@@ -1,84 +1,88 @@
return {
-- {
-- 'saghen/blink.compat',
-- version = '*',
-- lazy = true,
-- opts = {},
-- },
-- {
-- 'saghen/blink.cmp',
-- lazy = false,
-- dependencies = {
-- 'rafamadriz/friendly-snippets',
-- 'supermaven-nvim',
-- 'saghen/blink.compat',
-- },
-- version = 'v0.*', -- use a release tag to download pre-built binaries
-- opts = {
-- keymap = {
-- preset = 'default',
-- ['<C-n>'] = { 'select_next', 'fallback' },
-- ['<C-p>'] = { 'select_prev', 'fallback' },
-- ['<C-b>'] = { 'scroll_documentation_up', 'fallback' },
-- ['<C-f>'] = { 'scroll_documentation_down', 'fallback' },
-- ['<C-y>'] = { 'select_and_accept' },
-- },
-- appearance = {
-- use_nvim_cmp_as_default = true,
-- nerd_font_variant = 'mono',
-- },
-- sources = {
-- providers = {
-- ecolog = { name = 'ecolog', module = 'ecolog.integrations.cmp.blink_cmp' },
-- supermaven = { name = 'supermaven', module = 'blink.compat.source' },
-- },
-- completion = {
-- enabled_providers = { 'ecolog', 'supermaven', 'lsp', 'snippets', 'path', 'buffer' },
-- },
-- per_filetype = {
-- sql = { 'vim-dadbod-completion', 'buffer' },
-- },
-- },
-- completion = {
-- signature = {
-- enabled = true,
-- },
-- documentation = {
-- auto_show = true,
-- auto_show_delay_ms = 0,
-- },
-- accept = {
-- auto_brackets = {
-- enabled = true,
-- },
-- },
-- },
-- },
-- },
-- {
-- 'L3MON4D3/LuaSnip',
-- dependencies = 'rafamadriz/friendly-snippets',
-- opts = { history = true, updateevents = 'TextChanged,TextChangedI' },
-- config = function(_, opts)
-- require('luasnip').config.set_config(opts)
-- require('luasnip.loaders.from_vscode').lazy_load { exclude = vim.g.vscode_snippets_exclude or {} }
-- require('luasnip.loaders.from_vscode').lazy_load { paths = vim.g.vscode_snippets_path or '' }
-- require('luasnip.loaders.from_vscode').lazy_load { paths = { vim.fn.stdpath 'config' .. '/snippets' } }
--
-- require('luasnip.loaders.from_snipmate').load()
-- require('luasnip.loaders.from_snipmate').lazy_load { paths = vim.g.snipmate_snippets_path or '' }
--
-- require('luasnip.loaders.from_lua').load()
-- require('luasnip.loaders.from_lua').lazy_load { paths = vim.g.lua_snippets_path or '' }
--
-- vim.api.nvim_create_autocmd('InsertLeave', {
-- callback = function()
-- if require('luasnip').session.current_nodes[vim.api.nvim_get_current_buf()] and not require('luasnip').session.jump_active then
-- require('luasnip').unlink_current()
-- end
-- end,
-- })
-- end,
-- },
{
'saghen/blink.compat',
version = '*',
lazy = true,
opts = {},
},
{
'saghen/blink.cmp',
lazy = false,
dependencies = {
'rafamadriz/friendly-snippets',
'supermaven-nvim',
'saghen/blink.compat',
},
version = 'v0.*', -- use a release tag to download pre-built binaries
opts = {
keymap = {
preset = 'default',
['<C-n>'] = { 'select_next', 'fallback' },
['<C-p>'] = { 'select_prev', 'fallback' },
['<C-b>'] = { 'scroll_documentation_up', 'fallback' },
['<C-f>'] = { 'scroll_documentation_down', 'fallback' },
['<C-y>'] = { 'select_and_accept' },
},
appearance = {
use_nvim_cmp_as_default = true,
nerd_font_variant = 'mono',
},
sources = {
providers = {
ecolog = { score_offset = 6, name = 'ecolog', module = 'ecolog.integrations.cmp.blink_cmp' },
supermaven = { score_offset = 5, name = 'supermaven', module = 'blink.compat.source' },
lsp = { score_offset = 4, name = 'lsp', module = 'blink.cmp.sources.lsp' },
snippets = { score_offset = 3, name = 'snippets', module = 'blink.cmp.sources.snippets' },
path = { score_offset = 2, name = 'path', module = 'blink.cmp.sources.path' },
buffer = { score_offset = 1, name = 'buffer', module = 'blink.cmp.sources.buffer' },
},
completion = {
enabled_providers = { 'ecolog', 'supermaven', 'lsp', 'snippets', 'path', 'buffer' },
},
per_filetype = {
sql = { 'vim-dadbod-completion', 'buffer' },
},
},
completion = {
signature = {
enabled = true,
},
documentation = {
auto_show = true,
auto_show_delay_ms = 0,
},
accept = {
auto_brackets = {
enabled = true,
},
},
},
},
},
{
'L3MON4D3/LuaSnip',
dependencies = 'rafamadriz/friendly-snippets',
opts = { history = true, updateevents = 'TextChanged,TextChangedI' },
config = function(_, opts)
require('luasnip').config.set_config(opts)
require('luasnip.loaders.from_vscode').lazy_load { exclude = vim.g.vscode_snippets_exclude or {} }
require('luasnip.loaders.from_vscode').lazy_load { paths = vim.g.vscode_snippets_path or '' }
require('luasnip.loaders.from_vscode').lazy_load { paths = { vim.fn.stdpath 'config' .. '/snippets' } }

require('luasnip.loaders.from_snipmate').load()
require('luasnip.loaders.from_snipmate').lazy_load { paths = vim.g.snipmate_snippets_path or '' }

require('luasnip.loaders.from_lua').load()
require('luasnip.loaders.from_lua').lazy_load { paths = vim.g.lua_snippets_path or '' }

vim.api.nvim_create_autocmd('InsertLeave', {
callback = function()
if require('luasnip').session.current_nodes[vim.api.nvim_get_current_buf()] and not require('luasnip').session.jump_active then
require('luasnip').unlink_current()
end
end,
})
end,
},
}
-- vim: ts=2 sts=2 sw=2 et
212 changes: 106 additions & 106 deletions lua/plugins/cmp.lua
Original file line number Diff line number Diff line change
@@ -1,109 +1,109 @@
return {
{
'iguanacucumber/magazine.nvim',
name = 'nvim-cmp',
event = 'InsertEnter',
dependencies = {
{
-- snippet plugin
'L3MON4D3/LuaSnip',
dependencies = 'rafamadriz/friendly-snippets',
opts = { history = true, updateevents = 'TextChanged,TextChangedI' },
config = function(_, opts)
require('luasnip').config.set_config(opts)
-- vscode format
require('luasnip.loaders.from_vscode').lazy_load { exclude = vim.g.vscode_snippets_exclude or {} }
require('luasnip.loaders.from_vscode').lazy_load { paths = vim.g.vscode_snippets_path or '' }
require('luasnip.loaders.from_vscode').lazy_load { paths = { vim.fn.stdpath 'config' .. '/snippets' } }

-- snipmate format
require('luasnip.loaders.from_snipmate').load()
require('luasnip.loaders.from_snipmate').lazy_load { paths = vim.g.snipmate_snippets_path or '' }

-- lua format
require('luasnip.loaders.from_lua').load()
require('luasnip.loaders.from_lua').lazy_load { paths = vim.g.lua_snippets_path or '' }

vim.api.nvim_create_autocmd('InsertLeave', {
callback = function()
if require('luasnip').session.current_nodes[vim.api.nvim_get_current_buf()] and not require('luasnip').session.jump_active then
require('luasnip').unlink_current()
end
end,
})
end,
},
{
'windwp/nvim-autopairs',
opts = {
fast_wrap = {},
disable_filetype = { 'TelescopePrompt', 'vim' },
},
config = function(_, opts)
require('nvim-autopairs').setup(opts)

-- setup cmp for autopairs
local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
require('cmp').event:on('confirm_done', cmp_autopairs.on_confirm_done())
end,
},
'rafamadriz/friendly-snippets',
'saadparwaiz1/cmp_luasnip',
{ 'iguanacucumber/mag-nvim-lsp', name = 'cmp-nvim-lsp', opts = {} },
{ 'iguanacucumber/mag-nvim-lua', name = 'cmp-nvim-lua' },
{ 'iguanacucumber/mag-buffer', name = 'cmp-buffer' },
'hrsh7th/cmp-path',
},
config = function()
-- See `:help cmp`
local cmp = require 'cmp'
local luasnip = require 'luasnip'
luasnip.config.setup {}

cmp.setup {
performance = {
debounce = 0, -- default is 60ms
throttle = 0, -- default is 30ms
},
snippet = {
expand = function(args)
luasnip.lsp_expand(args.body)
end,
},
completion = { completeopt = 'menu,menuone,noinsert' },
mapping = cmp.mapping.preset.insert {
-- Select the [n]ext item
['<C-n>'] = cmp.mapping.select_next_item(),
-- Select the [p]revious item
['<C-p>'] = cmp.mapping.select_prev_item(),

-- Scroll the documentation window [b]ack / [f]orward
['<C-b>'] = cmp.mapping.scroll_docs(-4),
['<C-f>'] = cmp.mapping.scroll_docs(4),

-- Accept ([y]es) the completion.
-- This will auto-import if your LSP supports it.
-- This will expand snippets if the LSP sent a snippet.
['<C-y>'] = cmp.mapping.confirm { select = true },
},
sources = {
{ name = 'ecolog' },
{ name = 'nvim_lsp' },
{ name = 'luasnip' },
{ name = 'supermaven' },
{ name = 'path' },
{ name = 'buffer' },
{ name = 'nvim_lua' },
{ name = 'cmdline' },
},
}
cmp.setup.filetype({ 'sql' }, {
sources = {
{ name = 'vim-dadbod-completion' },
{ name = 'buffer' },
},
})
end,
},
-- {
-- 'iguanacucumber/magazine.nvim',
-- name = 'nvim-cmp',
-- event = 'InsertEnter',
-- dependencies = {
-- {
-- -- snippet plugin
-- 'L3MON4D3/LuaSnip',
-- dependencies = 'rafamadriz/friendly-snippets',
-- opts = { history = true, updateevents = 'TextChanged,TextChangedI' },
-- config = function(_, opts)
-- require('luasnip').config.set_config(opts)
-- -- vscode format
-- require('luasnip.loaders.from_vscode').lazy_load { exclude = vim.g.vscode_snippets_exclude or {} }
-- require('luasnip.loaders.from_vscode').lazy_load { paths = vim.g.vscode_snippets_path or '' }
-- require('luasnip.loaders.from_vscode').lazy_load { paths = { vim.fn.stdpath 'config' .. '/snippets' } }
--
-- -- snipmate format
-- require('luasnip.loaders.from_snipmate').load()
-- require('luasnip.loaders.from_snipmate').lazy_load { paths = vim.g.snipmate_snippets_path or '' }
--
-- -- lua format
-- require('luasnip.loaders.from_lua').load()
-- require('luasnip.loaders.from_lua').lazy_load { paths = vim.g.lua_snippets_path or '' }
--
-- vim.api.nvim_create_autocmd('InsertLeave', {
-- callback = function()
-- if require('luasnip').session.current_nodes[vim.api.nvim_get_current_buf()] and not require('luasnip').session.jump_active then
-- require('luasnip').unlink_current()
-- end
-- end,
-- })
-- end,
-- },
-- {
-- 'windwp/nvim-autopairs',
-- opts = {
-- fast_wrap = {},
-- disable_filetype = { 'TelescopePrompt', 'vim' },
-- },
-- config = function(_, opts)
-- require('nvim-autopairs').setup(opts)
--
-- -- setup cmp for autopairs
-- local cmp_autopairs = require 'nvim-autopairs.completion.cmp'
-- require('cmp').event:on('confirm_done', cmp_autopairs.on_confirm_done())
-- end,
-- },
-- 'rafamadriz/friendly-snippets',
-- 'saadparwaiz1/cmp_luasnip',
-- { 'iguanacucumber/mag-nvim-lsp', name = 'cmp-nvim-lsp', opts = {} },
-- { 'iguanacucumber/mag-nvim-lua', name = 'cmp-nvim-lua' },
-- { 'iguanacucumber/mag-buffer', name = 'cmp-buffer' },
-- 'hrsh7th/cmp-path',
-- },
-- config = function()
-- -- See `:help cmp`
-- local cmp = require 'cmp'
-- local luasnip = require 'luasnip'
-- luasnip.config.setup {}
--
-- cmp.setup {
-- performance = {
-- debounce = 0, -- default is 60ms
-- throttle = 0, -- default is 30ms
-- },
-- snippet = {
-- expand = function(args)
-- luasnip.lsp_expand(args.body)
-- end,
-- },
-- completion = { completeopt = 'menu,menuone,noinsert' },
-- mapping = cmp.mapping.preset.insert {
-- -- Select the [n]ext item
-- ['<C-n>'] = cmp.mapping.select_next_item(),
-- -- Select the [p]revious item
-- ['<C-p>'] = cmp.mapping.select_prev_item(),
--
-- -- Scroll the documentation window [b]ack / [f]orward
-- ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-- ['<C-f>'] = cmp.mapping.scroll_docs(4),
--
-- -- Accept ([y]es) the completion.
-- -- This will auto-import if your LSP supports it.
-- -- This will expand snippets if the LSP sent a snippet.
-- ['<C-y>'] = cmp.mapping.confirm { select = true },
-- },
-- sources = {
-- { name = 'ecolog' },
-- { name = 'nvim_lsp' },
-- { name = 'luasnip' },
-- { name = 'supermaven' },
-- { name = 'path' },
-- { name = 'buffer' },
-- { name = 'nvim_lua' },
-- { name = 'cmdline' },
-- },
-- }
-- cmp.setup.filetype({ 'sql' }, {
-- sources = {
-- { name = 'vim-dadbod-completion' },
-- { name = 'buffer' },
-- },
-- })
-- end,
-- },
}
-- vim: ts=2 sts=2 sw=2 et
4 changes: 2 additions & 2 deletions lua/plugins/ecolog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ return {
integrations = {
lspsaga = true,
-- BLINK-CMP uncomment two lines below
-- blink_cmp = true,
-- nvim_cmp = false
blink_cmp = true,
-- nvim_cmp = false,
},
shelter = {
configuration = {
Expand Down
Loading

0 comments on commit 519239c

Please sign in to comment.