From 0caf3e98acd665310fa1ed05b345a04284b22a17 Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Tue, 30 Aug 2022 20:49:50 -0400 Subject: [PATCH] cmp --- lua/plugins/nvim-cmp.lua | 10 ++++++++-- lua/plugins/nvim-lspconfig.lua | 27 --------------------------- lua/plugins/plugins.lua | 9 +-------- 3 files changed, 9 insertions(+), 37 deletions(-) diff --git a/lua/plugins/nvim-cmp.lua b/lua/plugins/nvim-cmp.lua index 25e8b2e..5bf468f 100644 --- a/lua/plugins/nvim-cmp.lua +++ b/lua/plugins/nvim-cmp.lua @@ -5,9 +5,15 @@ -- Plugin: nvim-cmp -- url: https://github.com/hrsh7th/nvim-cmpa +local cmp_status_ok, cmp = pcall(require, 'cmp') +if not cmp_status_ok then + return +end -local cmp = require 'cmp' -local luasnip = require 'luasnip' +local luasnip_status_ok, luasnip = pcall(require, 'luasnip') +if not luasnip_status_ok then + return +end cmp.setup { -- Load snippet support diff --git a/lua/plugins/nvim-lspconfig.lua b/lua/plugins/nvim-lspconfig.lua index 181f057..f21f31a 100644 --- a/lua/plugins/nvim-lspconfig.lua +++ b/lua/plugins/nvim-lspconfig.lua @@ -57,33 +57,6 @@ local on_attach = function(client, bufnr) buf_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', opts) end - ---[[ - -Language servers: - -Add your language server to `servers` - -For language servers list see: -https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md - -Bash --> bashls -https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#bashls - -Python --> pyright -https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#pyright - -C-C++ --> clangd -https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#clangd - -HTML/CSS/JSON --> vscode-html-languageserver -https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#html - -JavaScript/TypeScript --> tsserver -https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#tsserver - ---]] - -- Use a loop to conveniently call 'setup' on multiple servers and -- map buffer local keybindings when the language server attaches local servers = { 'bashls', 'pyright', 'pylsp', 'clangd', 'html', 'tsserver', 'marksman', 'prosemd_lsp', 'dockerls', 'cssls', 'cssmodules_ls', 'arduino_language_server', 'pyre', 'gopls', 'theme_check' } diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index a881667..b40936d 100755 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -25,14 +25,7 @@ return require'packer'.startup(function() }) end }) - -- mappings = { - -- MkdnEnter = {{'i', 'n', 'v'}, ''}, - -- MkdnToggleToDo = {{'i', 'n', 'v'}, ''}, - -- MkdnNewListItem = {{'n','v'}, ''}, - -- MkdnNextLink = false, - -- MkdnPrevLink = false, - -- MkdnTableNextCell = false, - -- } + -- Headlines Extension use 'lukas-reineke/headlines.nvim'