fix conflict
This commit is contained in:
commit
1f29896e48
2 changed files with 4 additions and 2 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1,2 +1,2 @@
|
||||||
nvim-pack-lock.json
|
nvim-pack-lock.json
|
||||||
.luarc.json
|
.luarc.json
|
||||||
|
|
|
||||||
4
init.lua
4
init.lua
|
|
@ -34,7 +34,8 @@ vim.pack.add({
|
||||||
"https://github.com/vyfor/cord.nvim",
|
"https://github.com/vyfor/cord.nvim",
|
||||||
"https://github.com/mason-org/mason-lspconfig.nvim.git",
|
"https://github.com/mason-org/mason-lspconfig.nvim.git",
|
||||||
"https://github.com/mason-org/mason.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
|
-- function to set colorsceme
|
||||||
vim.cmd("colorscheme " .. vim.fn.system("cat /home/lucy/.local/share/tinted-theming/tinty/current_scheme"))
|
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("qml-language-server")
|
||||||
|
vim.lsp.enable("clangd")
|
||||||
require("blink.cmp").setup({
|
require("blink.cmp").setup({
|
||||||
fuzzy = { implementation = "prefer_rust_with_warning" },
|
fuzzy = { implementation = "prefer_rust_with_warning" },
|
||||||
completion = {
|
completion = {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue