icons

config/.config/nvim/lazy-lock.json

@@ -24,6 +24,7 @@
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
   "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
+  "diffview.nvim": { "branch": "main", "commit": "d38c1b5266850f77f75e006bcc26213684e1e141" },
   "firenvim": { "branch": "master", "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" },
   "formatter.nvim": { "branch": "master", "commit": "34dcdfa0c75df667743b2a50dd99c84a557376f0" },
   "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },

vim/.vim/lua/plugins/base.lua

@@ -1,6 +1,7 @@
 local use_google = require("utils").use_google
 
 return {
+	-- "sindrets/diffview.nvim",
 	{ "nvim-lua/plenary.nvim", lazy = false },
 	{ "nvim-tree/nvim-web-devicons", lazy = false },
 	{ "squk/java-syntax.vim", ft = "java" },

vim/.vim/lua/plugins/cmp.lua

@@ -5,6 +5,8 @@ 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
+		print("LSP score " .. entry1.completion_item.score)
+		print("LSP score " .. entry2.completion_item.score)
 		return entry1.completion_item.score > entry2.completion_item.score
 	end
 end
@@ -81,8 +83,6 @@ return {
 				mapping = cmp.mapping.preset.cmdline(),
 				sources = cmp.config.sources({
 					{ name = "async_path" },
-					-- { name = "cmdline_history" },
-					-- { name = "treesitter", priority = 7 },
 					{ name = "cmdline", option = { ignore_cmds = { "edit", "write" } } },
 				}),
 			})
@@ -95,9 +95,9 @@ return {
 					{ name = "crates" },
 					{ name = "emoji", max_item_count = 10 },
 					{ name = "luasnip", max_item_count = 5, priority = 6 },
-					{ name = "nvim_lsp", priority = 8 },
+					{ name = "nvim_lsp", priority = 5 },
 					{ name = "spell", max_item_count = 5 },
-					{ name = "treesitter", max_item_count = 5, priority = 7 },
+					{ name = "treesitter", max_item_count = 5, priority = 2 },
 				}, conditionalSources)),
 
 				formatting = {
@@ -105,11 +105,12 @@ return {
 						menu = {
 							async_path = " path",
 							buffer = " Buf",
-							codiuem = "󰧑 Codeium",
+							cmdline = " cmd",
+							codiuem = "󰚩 Codeium",
 							crates = " rust",
 							luasnip = " snip",
-							nvim_ciderlsp = "󰧑 Cider",
-							nvim_lsp = " LSP",
+							nvim_ciderlsp = "󰚩 Cider",
+							nvim_lsp = " LSP",
 							nvim_lua = " lua",
 							treesitter = " ts",
 						},