diff --git a/vim/.vim/lua/plugins/cmp.lua b/vim/.vim/lua/plugins/cmp.lua index a1e0934..320a4cc 100644 --- a/vim/.vim/lua/plugins/cmp.lua +++ b/vim/.vim/lua/plugins/cmp.lua @@ -61,13 +61,13 @@ return { { name = "emoji" }, { name = "async_path" }, { name = "spell" }, - { name = "buffer", option = { keyword_pattern = [[\k\+]] }, priority = 1 }, + -- { name = "buffer", option = { keyword_pattern = [[\k\+]] }, priority = 1 }, -- { name = "buffer-lines" }, }) if use_google() then table.insert(conditionalSources, { name = "analysislsp", priority = 5 }) - table.insert(conditionalSources, { name = "nvim_ciderlsp", priority = 9 }) + table.insert(conditionalSources, { name = "nvim_ciderlsp", priority = 8 }) else table.insert(conditionalSources, { name = "cmp_tabnine", priority = 9 }) end diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua index 84ef70b..a789044 100644 --- a/vim/.vim/lua/plugins/google.lua +++ b/vim/.vim/lua/plugins/google.lua @@ -74,7 +74,7 @@ return { dependencies = { "glaive" }, config = function() vim.cmd( - [[Glaive codefmt ktfmt_executable=`["/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt_deploy.jar", "--google-style"]`]] + [[Glaive codefmt gofmt_executable=/usr/lib/google-golang/bin/gofmt ktfmt_executable=/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt,--google-style]] ) end, }, diff --git a/vim/.vim/lua/plugins/lsp.lua b/vim/.vim/lua/plugins/lsp.lua index e198e44..4b66b44 100644 --- a/vim/.vim/lua/plugins/lsp.lua +++ b/vim/.vim/lua/plugins/lsp.lua @@ -7,8 +7,6 @@ return { "nvim-lua/lsp-status.nvim", "VonHeikemen/lsp-zero.nvim", "rcarriga/nvim-notify", - "ldelossa/litee.nvim", - "ldelossa/litee-calltree.nvim", }, keys = { { "rn", "lua vim.lsp.buf.rename()" }, @@ -36,9 +34,6 @@ return { local lsp_status = require("lsp-status") lsp_status.register_progress() - require("litee.lib").setup({}) - require("litee.calltree").setup({}) - vim.opt.spell = true vim.opt.spelllang = { "en_us" }