From 24fb0019f8c9a4e96504e55a5ca001cf368f2b54 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Mon, 6 Sep 2021 21:21:51 -0700 Subject: [PATCH] Removed chadtree, fixed and added integrations with cmp I felt that chadtree was bloated --- .config/nvim/init.lua | 3 +++ .config/nvim/lua/lsp.lua | 6 ++++-- .config/nvim/lua/plugins.lua | 19 ++++--------------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 045d2c6..34323f0 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -13,6 +13,9 @@ require('plugins') -- Plugins to Configure -- [ ] toggleterm -- [ ] neoscroll +-- [x] cmp +-- [x] lspkind +-- [x] lspsignature -- -- Plugins to install: -- [ ] telescope diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua index 54d9e08..caee677 100644 --- a/.config/nvim/lua/lsp.lua +++ b/.config/nvim/lua/lsp.lua @@ -1,6 +1,7 @@ local M = {} M.signature = function() ---- lsp_signature >>> + require "lsp_signature".setup() cfg = { Gse_lspsaga = true } @@ -26,7 +27,7 @@ M.lspinstall = function() ---- lspinstall >>> end -- <<< -M.treesitter = function () ---- treesitter >>> +M.treesitter = function() ---- treesitter >>> require('nvim-treesitter.configs').setup { highlight = { enable = true, -- false will disable the whole extension @@ -145,6 +146,7 @@ M.cmp = function() ---- cmp >>> { name = 'calc' }, { name = 'vsnip' }, { name = 'nvim_lsp' }, + { name = 'nvim_lua' }, { name = 'spell' }, { name = 'treesitter' }, { name = 'emoji' }, @@ -207,7 +209,7 @@ M.lspconfig = function() ---- lspconfig >>> -- Use a loop to conveniently call 'setup' on multiple servers and -- map buffer local keybindings when the language server attaches - local servers = { 'clangd', 'bash' } + local servers = { 'clangd', } for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup { on_attach = on_attach, diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 9b3f4dc..04fd08d 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -105,23 +105,12 @@ return require('packer').startup(function() -- require('other').gitsigns() -- end } - -- use { -- file manager - -- 'kyazdani42/nvim-tree.lua', - -- requires = 'kyazdani42/nvim-web-devicons', - -- config = function() - -- require('other').nvimtree() - -- end - -- } - use { -- new file manager - 'ms-jpq/chadtree', - branch = 'chad', - run = 'python3 -m chadtree deps', + use { -- file manager + 'kyazdani42/nvim-tree.lua', + requires = 'kyazdani42/nvim-web-devicons', config = function() - require('other').chadtree() + require('other').nvimtree() end - -- config = funciton () - -- vim.cmd 'nnoremap v CHADopen' - -- end } use { -- terminal "akinsho/toggleterm.nvim",