diff --git a/init.lua b/init.lua index edea048..cdb45b6 100644 --- a/init.lua +++ b/init.lua @@ -29,16 +29,16 @@ local vscodeplugs = require('vscode.plug') local neovimplugs = require('neovim.plug') if G.g.vscode then - plugs = {vscodeplugs, normalplugs} + normalplugs = {vscodeplugs, normalplugs} else - plugs = {neovimplugs, normalplugs} + normalplugs = {neovimplugs, normalplugs} end -require("lazy").setup(plugs) +require("lazy").setup(normalplugs) if G.g.vscode then require('vscode.vscode') -else +else require('neovim.neovim') end diff --git a/lua/neovim/plugsettings/coc.lua b/lua/neovim/plugsettings/coc.lua index a0132a2..1794724 100644 --- a/lua/neovim/plugsettings/coc.lua +++ b/lua/neovim/plugsettings/coc.lua @@ -2,7 +2,6 @@ return { { 'neoclide/coc.nvim', config = function() - G.opt.backup = false G.opt.writebackup = false @@ -11,7 +10,10 @@ return { G.g.coc_global_extensions = { 'coc-pyright', 'coc-java', + 'coc-sh', + 'coc-sumneko-lua', + 'coc-word', 'coc-lists', 'coc-pairs', 'coc-marketplace', @@ -27,8 +29,9 @@ return { G.map({ - { "i", "", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "" : coc#refresh()', opts }, - { "i", "", [[coc#pum#visible() ? coc#pum#prev(1) : "\"]], opts }, +-- { "i", "", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "" : coc#refresh()', opts }, +-- { "i", "", [[coc#pum#visible() ? coc#pum#prev(1) : "\"]], opts }, + { "i", "", [[coc#pum#visible() ? coc#pum#confirm() : "\u\\=coc#on_enter()\"]], opts }, { "n", "gd", "(coc-definition)", {silent = true} }, @@ -142,6 +145,7 @@ return { -- provide custom statusline: lightline.vim, vim-airline vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}") + -- Mappings for CoCList -- code actions and coc stuff ---@diagnostic disable-next-line: redefined-local