Move to separate plugings file

nvim/init.lua

@@ -1,43 +1,10 @@
-require('packer').startup(function(use)
+require('plugins')
-    use 'ConradIrwin/vim-bracketed-paste'
-    use 'cappyzawa/trim.nvim'
-    use "rafamadriz/friendly-snippets"
-    use 'christoomey/vim-tmux-navigator'
-    use 'cohama/lexima.vim'
-    use 'editorconfig/editorconfig-vim'
-    use 'ervandew/supertab'
-    use 'hrsh7th/cmp-buffer'
-    use 'hrsh7th/cmp-cmdline'
-    use 'hrsh7th/cmp-nvim-lsp'
-    use 'hrsh7th/cmp-path'
-    use 'hrsh7th/vim-vsnip-integ'
-    use 'hrsh7th/cmp-vsnip'
-    use 'hrsh7th/nvim-cmp'
-    use 'hrsh7th/vim-vsnip'
-    use 'kristijanhusak/vim-hybrid-material'
-    use 'lervag/vimtex'
-    use 'neovim/nvim-lspconfig'
-    use 'octol/vim-cpp-enhanced-highlight'
-    use 'prabirshrestha/asyncomplete-lsp.vim'
-    use 'prabirshrestha/vim-lsp'
-    use 'tmux-plugins/vim-tmux'
-    use 'tmux-plugins/vim-tmux-focus-events'
-    use 'tomtom/tcomment_vim'
-    use 'vim-airline/vim-airline'
-    use 'vim-airline/vim-airline-themes'
-    use 'vimwiki/vimwiki'
-    use 'wbthomason/packer.nvim'
-    use 'williamboman/nvim-lsp-installer'
-    use {'nvim-telescope/telescope-fzf-native.nvim', run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'}
-    use {'nvim-telescope/telescope.nvim', requires = {{'nvim-lua/plenary.nvim'}}}
-    use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
-    use {'glacambre/firenvim', run = function() vim.fn['firenvim#install'](0) end}
-end)
-
 require('settings')
+require('autopairs_config')
 require('lsp_config')
-require('telescope-config')
+require('telescope_config')
 require('mappings')
+
 require('trim').setup({
     disable = {"markdown", "vimwiki"},
     patterns = {

nvim/lua/autopairs_config.lua

@@ -0,0 +1,11 @@
+local M = {}
+
+function M.setup()
+  local npairs = require "nvim-autopairs"
+  npairs.setup {
+    check_ts = true,
+  }
+  npairs.add_rules(require "nvim-autopairs.rules.endwise-lua")
+end
+
+return M

nvim/lua/lsp_config.lua

@@ -77,6 +77,9 @@ cmp.setup.cmdline(':', {
     })
 })
 
+-- local cmp_autopairs = require('nvim-autopairs.completion.cmp')
+-- cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done())
+
 -- Setup lspconfig.
 local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
 require("nvim-lsp-installer").setup({

nvim/lua/mappings.lua

@@ -1,4 +1,5 @@
 vim.api.nvim_set_keymap("i", "jj", "<Esc>", {})
+vim.api.nvim_set_keymap("v", "jj", "<Esc>", {})
 vim.api.nvim_set_keymap("n", "j", "gj", {})
 vim.api.nvim_set_keymap("n", "k", "gk", {})
 vim.api.nvim_set_keymap("n", "<S-k>", "<Nop>", {})

nvim/lua/plugins.lua

@@ -0,0 +1,43 @@
+require('packer').startup(function(use)
+    use 'ConradIrwin/vim-bracketed-paste'
+    use 'cappyzawa/trim.nvim'
+    use "rafamadriz/friendly-snippets"
+    use 'christoomey/vim-tmux-navigator'
+    use 'editorconfig/editorconfig-vim'
+    use 'ervandew/supertab'
+    use 'hrsh7th/cmp-buffer'
+    use 'hrsh7th/cmp-cmdline'
+    use 'hrsh7th/cmp-nvim-lsp'
+    use 'hrsh7th/cmp-path'
+    use 'hrsh7th/vim-vsnip-integ'
+    use 'hrsh7th/cmp-vsnip'
+    use 'hrsh7th/nvim-cmp'
+    use 'hrsh7th/vim-vsnip'
+    use 'kristijanhusak/vim-hybrid-material'
+    use 'lervag/vimtex'
+    use 'neovim/nvim-lspconfig'
+    use 'octol/vim-cpp-enhanced-highlight'
+    use 'prabirshrestha/asyncomplete-lsp.vim'
+    use 'prabirshrestha/vim-lsp'
+    use 'tmux-plugins/vim-tmux'
+    use 'tmux-plugins/vim-tmux-focus-events'
+    use 'tomtom/tcomment_vim'
+    use 'vim-airline/vim-airline'
+    use 'vim-airline/vim-airline-themes'
+    use 'vimwiki/vimwiki'
+    use 'wbthomason/packer.nvim'
+    use 'williamboman/nvim-lsp-installer'
+    use 'Vimjas/vim-python-pep8-indent'
+    use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
+    use {
+        "windwp/nvim-autopairs",
+        wants = "nvim-treesitter",
+        module = { "nvim-autopairs.completion.cmp", "nvim-autopairs" },
+        config = function()
+            require("config.autopairs").setup()
+        end,
+    }
+    use {'nvim-telescope/telescope-fzf-native.nvim', run = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build'}
+    use {'nvim-telescope/telescope.nvim', requires = {{'nvim-lua/plenary.nvim'}}}
+    use {'glacambre/firenvim', run = function() vim.fn['firenvim#install'](0) end}
+end)

nvim/lua/telescope_config.lua

@@ -23,7 +23,7 @@ require("telescope").setup{
 
 telescope.load_extension('fzf')
 
-vim.api.nvim_set_keymap("n", "<C-p>", "<CMD>lua require'telescope-config'.project_files()<CR>", {noremap = true, silent = true})
+vim.api.nvim_set_keymap("n", "<C-p>", "<CMD>lua require'telescope_config'.project_files()<CR>", {noremap = true, silent = true})
 vim.api.nvim_set_keymap("n", "<C-O>", "<cmd>Telescope buffers theme=ivy<cr>", { silent = true, noremap = true })
 vim.api.nvim_set_keymap("n", "<C-f>", "<cmd>lua require('telescope.builtin').live_grep{ cwd = vim.fn.systemlist(\"git rev-parse --show-toplevel 2> /dev/null || pwd\")[1] }<cr>", { silent = true, noremap = true })