From 0faed7d95edb1f95f8191d559002d5195ff7d0d5 Mon Sep 17 00:00:00 2001 From: mace Date: Wed, 23 Aug 2023 19:28:15 +0200 Subject: [PATCH] added autopairs; keymaps --- init.lua | 1 + lua/custom/autopairs.lua | 30 ++++++++++++++++++++++++++++++ lua/custom/keymaps.lua | 1 + lua/custom/plugins/init.lua | 2 ++ 4 files changed, 34 insertions(+) create mode 100644 lua/custom/autopairs.lua diff --git a/init.lua b/init.lua index 26ac967..b25c62f 100644 --- a/init.lua +++ b/init.lua @@ -515,3 +515,4 @@ require('custom.lspconfig') require('custom.lspsaga') require('custom.nvim-cmp') require('custom.toggleterm') +require('custom.autopairs') diff --git a/lua/custom/autopairs.lua b/lua/custom/autopairs.lua new file mode 100644 index 0000000..19890bb --- /dev/null +++ b/lua/custom/autopairs.lua @@ -0,0 +1,30 @@ +-- import nvim-autopairs safely +local autopairs_setup, autopairs = pcall(require, "nvim-autopairs") +if not autopairs_setup then + return +end + +-- configure autopairs +autopairs.setup({ + check_ts = true, -- enable treesitter + ts_config = { + lua = { "string" }, -- don't add pairs in lua string treesitter nodes + javascript = { "template_string" }, -- don't add pairs in javscript template_string treesitter nodes + java = false, -- don't check treesitter on java + }, +}) + +-- import nvim-autopairs completion functionality safely +local cmp_autopairs_setup, cmp_autopairs = pcall(require, "nvim-autopairs.completion.cmp") +if not cmp_autopairs_setup then + return +end + +-- import nvim-cmp plugin safely (completions plugin) +local cmp_setup, cmp = pcall(require, "cmp") +if not cmp_setup then + return +end + +-- make autopairs and completion work together +cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done()) diff --git a/lua/custom/keymaps.lua b/lua/custom/keymaps.lua index 4980d7b..4a9caae 100644 --- a/lua/custom/keymaps.lua +++ b/lua/custom/keymaps.lua @@ -52,3 +52,4 @@ keymap.set('n', '', 'ToggleTerm direction=horizontal', { silent = -- vim-sneak keymap.set('n', 'f', 'Sneak_s', { silent = true }) keymap.set('n', 'F', 'Sneak_S', { silent = true }) +keymap.set('n', 's', 's', { silent = true }) diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 7f6e747..29caedf 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -47,6 +47,8 @@ return { dependencies = "mfussenegger/nvim-dap", }, "nvim-telescope/telescope-dap.nvim", + -- autoclose parens, brackets, quotes, etc... + "windwp/nvim-autopairs", { "akinsho/toggleterm.nvim",