workstation

This commit is contained in:
Christian Nieves
2023-08-17 15:24:36 -05:00
parent de5d5c3271
commit fb1185cc2d
4 changed files with 14 additions and 14 deletions

View File

@ -37,8 +37,6 @@
"lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" }, "lazy.nvim": { "branch": "main", "commit": "25beed5e2e935ebc00d7e3eed1dc502df3c40e39" },
"libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" }, "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" },
"lsp-lens.nvim": { "branch": "main", "commit": "13d25ad8bd55aa34cc0aa3082e78a4157c401346" }, "lsp-lens.nvim": { "branch": "main", "commit": "13d25ad8bd55aa34cc0aa3082e78a4157c401346" },
"lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
"lsp-zero.nvim": { "branch": "v2.x", "commit": "3638944692d07497f4ae313ba7b68718969ccb27" },
"lsp_lines.nvim": { "branch": "main", "commit": "f53af96d4789eef39a082dbcce078d2bfc384ece" }, "lsp_lines.nvim": { "branch": "main", "commit": "f53af96d4789eef39a082dbcce078d2bfc384ece" },
"lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
"lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
@ -68,7 +66,6 @@
"registers.nvim": { "branch": "main", "commit": "2ab8372bb837f05fae6b43091f10a0b725d113ca" }, "registers.nvim": { "branch": "main", "commit": "2ab8372bb837f05fae6b43091f10a0b725d113ca" },
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
"telekasten.nvim": { "branch": "main", "commit": "4a5e57eee9c5154ed77423bb7fa6619fdb0784cd" }, "telekasten.nvim": { "branch": "main", "commit": "4a5e57eee9c5154ed77423bb7fa6619fdb0784cd" },
"telescope-file-browser.nvim": { "branch": "master", "commit": "e03ff55962417b69c85ef41424079bb0580546ba" },
"telescope.nvim": { "branch": "master", "commit": "47c755d737702df7a39b640c8d9c473a728be1df" }, "telescope.nvim": { "branch": "master", "commit": "47c755d737702df7a39b640c8d9c473a728be1df" },
"telescope_citc": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" }, "telescope_citc": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" },
"telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" }, "telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" },

View File

@ -3,6 +3,12 @@ local tprint = require("utils").tprint
local dump = require("utils").dump local dump = require("utils").dump
local log = require("utils").log local log = require("utils").log
local function compare_by_ciderlsp_score(entry1, entry2)
if entry1.completion_item.score ~= nil and entry2.completion_item.score ~= nil then
return entry1.completion_item.score > entry2.completion_item.score
end
end
local has_words_before = function() local has_words_before = function()
local line, col = unpack(vim.api.nvim_win_get_cursor(0)) local line, col = unpack(vim.api.nvim_win_get_cursor(0))
return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
@ -60,7 +66,6 @@ return {
}) })
if use_google() then if use_google() then
require("cmp_nvim_ciderlsp").setup()
table.insert(conditionalSources, { name = "analysislsp", priority = 5 }) table.insert(conditionalSources, { name = "analysislsp", priority = 5 })
table.insert(conditionalSources, { name = "nvim_ciderlsp", priority = 9 }) table.insert(conditionalSources, { name = "nvim_ciderlsp", priority = 9 })
else else
@ -135,6 +140,7 @@ return {
sorting = { sorting = {
comparators = { comparators = {
compare_by_ciderlsp_score,
cmp.config.compare.priority, cmp.config.compare.priority,
cmp.config.compare.offset, cmp.config.compare.offset,
cmp.config.compare.exact, cmp.config.compare.exact,

View File

@ -167,9 +167,6 @@ return {
require("lualine").refresh() require("lualine").refresh()
end end
end end
require("cmp_nvim_ciderlsp").setup({
-- multiline_summary_symbol = "…",
})
capabilities = require("cmp_nvim_ciderlsp").update_capabilities(capabilities) capabilities = require("cmp_nvim_ciderlsp").update_capabilities(capabilities)
capabilities.workspace.codeLens = { refreshSupport = true } capabilities.workspace.codeLens = { refreshSupport = true }
capabilities.workspace.diagnostics = { refreshSupport = true } capabilities.workspace.diagnostics = { refreshSupport = true }

View File

@ -9,14 +9,14 @@ return {
return { vim.fn.split(vim.fn.getreg(""), "\n"), vim.fn.getregtype("") } return { vim.fn.split(vim.fn.getreg(""), "\n"), vim.fn.getregtype("") }
end end
vim.g.clipboard = { -- vim.g.clipboard = {
name = "osc52", -- name = "osc52",
copy = { ["+"] = copy, ["*"] = copy }, -- copy = { ["+"] = copy, ["*"] = copy },
paste = { ["+"] = paste, ["*"] = paste }, -- paste = { ["+"] = paste, ["*"] = paste },
} -- }
-- Now the '+' register will copy to system clipboard using OSC52 -- Now the '+' register will copy to system clipboard using OSC52
-- vim.keymap.set("n", "<leader>c", '"+y') vim.keymap.set("n", "<leader>y", '"+y')
-- vim.keymap.set("n", "<leader>cc", '"+yy') vim.keymap.set("n", "<leader>yy", '"+yy')
end, end,
} }