diff options
| -rw-r--r-- | lua/core/compe.lua | 2 | ||||
| -rw-r--r-- | lua/core/treesitter.lua | 2 | ||||
| -rw-r--r-- | lua/default-config.lua | 2 | ||||
| -rw-r--r-- | lua/plugins.lua | 32 |
4 files changed, 29 insertions, 9 deletions
diff --git a/lua/core/compe.lua b/lua/core/compe.lua index c0bd58ab..73e93b05 100644 --- a/lua/core/compe.lua +++ b/lua/core/compe.lua @@ -87,7 +87,7 @@ M.setup = function() vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_tab_complete()", { expr = true }) vim.api.nvim_set_keymap("i", "<C-Space>", "compe#complete()", { noremap = true, silent = true, expr = true }) - vim.api.nvim_set_keymap("i", "<CR>", "compe#confirm('<CR>')", { noremap = true, silent = true, expr = true }) + -- vim.api.nvim_set_keymap("i", "<CR>", "compe#confirm('<CR>')", { noremap = true, silent = true, expr = true }) vim.api.nvim_set_keymap("i", "<C-e>", "compe#close('<C-e>')", { noremap = true, silent = true, expr = true }) vim.api.nvim_set_keymap("i", "<C-f>", "compe#scroll({ 'delta': +4 })", { noremap = true, silent = true, expr = true }) vim.api.nvim_set_keymap("i", "<C-d>", "compe#scroll({ 'delta': -4 })", { noremap = true, silent = true, expr = true }) diff --git a/lua/core/treesitter.lua b/lua/core/treesitter.lua index c81f0696..150daa9c 100644 --- a/lua/core/treesitter.lua +++ b/lua/core/treesitter.lua @@ -18,7 +18,7 @@ M.config = function() }, -- indent = {enable = true, disable = {"python", "html", "javascript"}}, -- TODO seems to be broken - indent = { enable = { "javascriptreact" } }, + indent = { enable = true }, autotag = { enable = false }, textobjects = { swap = { diff --git a/lua/default-config.lua b/lua/default-config.lua index 8abdc412..46db2d46 100644 --- a/lua/default-config.lua +++ b/lua/default-config.lua @@ -330,7 +330,7 @@ lvim.lang = { }, html = { formatter = { - exe = "", + exe = "prettier", args = {}, }, linters = { diff --git a/lua/plugins.lua b/lua/plugins.lua index 7d2356d5..62450b1d 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -32,21 +32,46 @@ return { }, -- Autocomplete + -- { + -- "hrsh7th/nvim-compe", + -- event = "InsertEnter", + -- config = function() + -- require("core.compe").setup() + -- if lvim.builtin.compe.on_config_done then + -- lvim.builtin.compe.on_config_done(require "compe") + -- end + -- end, + -- }, + + -- Completion & Snippets { "hrsh7th/nvim-compe", - -- event = "InsertEnter", + event = "InsertEnter", config = function() require("core.compe").setup() if lvim.builtin.compe.on_config_done then lvim.builtin.compe.on_config_done(require "compe") end end, + wants = "vim-vsnip", + requires = { + { + "hrsh7th/vim-vsnip", + wants = "friendly-snippets", + event = "InsertCharPre", + }, + { + "rafamadriz/friendly-snippets", + event = "InsertCharPre", + }, + }, }, -- Autopairs { "windwp/nvim-autopairs", -- event = "InsertEnter", + after = "nvim-compe", config = function() require "core.autopairs" if lvim.builtin.autopairs.on_config_done then @@ -55,11 +80,6 @@ return { end, }, - -- Snippets - - { "hrsh7th/vim-vsnip", event = "InsertEnter" }, - { "rafamadriz/friendly-snippets", event = "InsertEnter" }, - -- Treesitter { "nvim-treesitter/nvim-treesitter", |