fix merge conflict

This commit is contained in:
lucy 2026-06-02 18:25:56 +02:00
commit e09b1d6497

View file

@ -34,7 +34,8 @@ vim.pack.add({
"https://github.com/vyfor/cord.nvim",
"https://github.com/mason-org/mason-lspconfig.nvim.git",
"https://github.com/mason-org/mason.nvim.git",
{ src = "https://github.com/Saghen/blink.cmp", version = "v1" },
"https://github.com/Saghen/blink.cmp",
"https://github.com/saghen/blink.lib",
})
-- function to set colorsceme
vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme"))
@ -46,6 +47,7 @@ vim.lsp.config("qml-language-server", {
})
vim.lsp.enable("qml-language-server")
vim.lsp.enable("clangd")
require("blink.cmp").setup({
fuzzy = { implementation = "prefer_rust_with_warning" },
completion = {