diff --git a/vim/.vim/lua/lsp.lua b/vim/.vim/lua/lsp.lua index 73c54f8..6af18a5 100644 --- a/vim/.vim/lua/lsp.lua +++ b/vim/.vim/lua/lsp.lua @@ -228,6 +228,8 @@ local conditionalSources = { { name = "nvim_lua" }, { name = "nvim_lsp" }, { name = "path" }, + { name = "treesitter" }, + { name = "crates" }, { name = "vim_vsnip" }, { name = 'nvim_lsp_signature_help' }, { name = "buffer", keyword_length = 5 }, @@ -246,6 +248,9 @@ local use_google = require("utils").use_google if use_google() then table.insert(conditionalSources, { name = 'nvim_ciderlsp', priority = 9 }) table.insert(conditionalSources, { name = 'analysislsp', priority = 9 }) +else + table.insert(conditionalSources, {name = 'cmp_tabnine'}) + end cmp.setup({ @@ -335,7 +340,9 @@ cmp.setup({ menu = { nvim_ciderlsp = "", buffer = "", + crates = "📦", nvim_lsp = "[CiderLSP]", + cmp_tabnine = "[TabNine]", nvim_lua = "[API]", path = "[path]", tmux = "[TMUX]", diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua index d2b94bc..6ffd872 100644 --- a/vim/.vim/lua/plugins.lua +++ b/vim/.vim/lua/plugins.lua @@ -61,11 +61,16 @@ require('packer').startup(function(use) 'hrsh7th/cmp-nvim-lua', 'hrsh7th/cmp-path', 'hrsh7th/cmp-vsnip', + 'ray-x/cmp-treesitter', { 'saadparwaiz1/cmp_luasnip', after = {'LuaSnip'} }, }, -- config = [[require('lsp')]], -- event = 'InsertEnter', } + use { + "tzachar/cmp-tabnine", run = "./install.sh", + disable = use_google(), + } use { "williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim", @@ -75,6 +80,12 @@ require('packer').startup(function(use) 'jose-elias-alvarez/null-ls.nvim', config = [[ require("null_lsp") ]] } + use { + 'saecki/crates.nvim', + tag = 'v0.3.0', + requires = { 'nvim-lua/plenary.nvim' }, + config = [[ require('crates').setup() ]] + } use 'simrat39/rust-tools.nvim' use 'folke/trouble.nvim'