From 68a6a2884b178851ec9996bb3be5438de35dac28 Mon Sep 17 00:00:00 2001 From: long Date: Wed, 3 Nov 2021 09:53:28 -0500 Subject: [PATCH] modified: init.lua modified: lua/config.lua modified: lua/keybinds.lua renamed: lua/lsp_setup.lua -> lua/lsp.lua modified: lua/plugins.lua modified: plugin/packer_compiled.lua --- init.lua | 2 +- lua/config.lua | 2 +- lua/keybinds.lua | 4 +- lua/{lsp_setup.lua => lsp.lua} | 8 +++ lua/plugins.lua | 4 +- plugin/packer_compiled.lua | 93 ++++++++++++++++++++++------------ 6 files changed, 75 insertions(+), 38 deletions(-) rename lua/{lsp_setup.lua => lsp.lua} (96%) diff --git a/init.lua b/init.lua index 061219d..9876062 100644 --- a/init.lua +++ b/init.lua @@ -4,7 +4,7 @@ require "plugins" require "config" require "keybinds" require "save_buffer_position" -require "lsp_setup" +require "lsp" --local theme = vim.env.LIGHTMODE == "1" and "onehalflight" or "onedark" --vim.cmd("colorscheme " .. theme) diff --git a/lua/config.lua b/lua/config.lua index b2ef1c4..f6620ef 100644 --- a/lua/config.lua +++ b/lua/config.lua @@ -27,7 +27,7 @@ opt.linebreak = true opt.inccommand = "split" -- Get a preview of replacements opt.incsearch = true -- Shows the match while typing ---opt.undofile = true +opt.undofile = true --opt.undodir = "~/.local/share/nvim/undodir" opt.encoding = "utf-8" diff --git a/lua/keybinds.lua b/lua/keybinds.lua index 6d66cc7..a4c8d7e 100644 --- a/lua/keybinds.lua +++ b/lua/keybinds.lua @@ -63,12 +63,12 @@ map("v", "w", hopword, {silent = true}) -- FZF -- --------- map("n", "o", ":Files ") -map("n", "b", ":Buffers ") +map("n", "p", ":Buffers ") map("n", "h", ":Helptags ") map("n", ";", ":History: ") map("n", "c", ":Commands ") map("n", "/", ":Rg ") -map("n", "[", ":Windows ") +--map("n", "[", ":Windows ") --------- -- ALE -- diff --git a/lua/lsp_setup.lua b/lua/lsp.lua similarity index 96% rename from lua/lsp_setup.lua rename to lua/lsp.lua index ab88d5e..3da52d5 100644 --- a/lua/lsp_setup.lua +++ b/lua/lsp.lua @@ -1,4 +1,9 @@ local opt = vim.opt -- to set options +-- +-------------------- +-- NVIM-AUTOPAIRS -- +-------------------- +require("nvim-autopairs").setup {check_ts = true} -------------- -- NVIM-CMP -- @@ -13,6 +18,7 @@ local has_words_before = function() end local luasnip = require("luasnip") +local cmp_autopairs = require("nvim-autopairs.completion.cmp") local cmp = require("cmp") cmp.setup { @@ -65,6 +71,8 @@ cmp.setup { } } +cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({map_char = {tex = ""}})) + -------------------- -- NVIM-AUTOPAIRS -- -------------------- diff --git a/lua/plugins.lua b/lua/plugins.lua index 7bee0b2..5e6b993 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -34,8 +34,8 @@ require("packer").startup( } -- EDITOR - --use "windwp/nvim-autopairs" - use "jiangmiao/auto-pairs" + use "windwp/nvim-autopairs" + --use "jiangmiao/auto-pairs" use "dense-analysis/ale" --use "nathanmsmith/nvim-ale-diagnostic" diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index e61d09d..9ba04a4 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -71,120 +71,149 @@ time([[Defining packer_plugins]], true) _G.packer_plugins = { LuaSnip = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/LuaSnip" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/LuaSnip", + url = "https://github.com/L3MON4D3/LuaSnip" }, ale = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/ale" - }, - ["auto-pairs"] = { - loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/auto-pairs" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/ale", + url = "https://github.com/dense-analysis/ale" }, ["awesome-vim-colorschemes"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/awesome-vim-colorschemes" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/awesome-vim-colorschemes", + url = "https://github.com/rafi/awesome-vim-colorschemes" }, ["bclose.vim"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/bclose.vim" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/bclose.vim", + url = "https://github.com/rbgrouleff/bclose.vim" }, ["cmp-nvim-lsp"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" }, cmp_luasnip = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/cmp_luasnip" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/cmp_luasnip", + url = "https://github.com/saadparwaiz1/cmp_luasnip" }, ["emmet-vim"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/emmet-vim" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/emmet-vim", + url = "https://github.com/mattn/emmet-vim" }, fzf = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/fzf" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/fzf", + url = "https://github.com/junegunn/fzf" }, ["fzf.vim"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/fzf.vim" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/fzf.vim", + url = "https://github.com/junegunn/fzf.vim" }, hop = { config = { "\27LJ\1\0025\0\0\2\0\3\0\a4\0\0\0%\1\1\0>\0\2\0027\0\2\0002\1\0\0>\0\2\1G\0\1\0\nsetup\bhop\frequire\0" }, loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/hop" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/hop", + url = "https://github.com/phaazon/hop.nvim" }, ["lualine.nvim"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/lualine.nvim" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/lualine.nvim", + url = "https://github.com/nvim-lualine/lualine.nvim" }, ["null-ls.nvim"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/null-ls.nvim" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/null-ls.nvim", + url = "https://github.com/jose-elias-alvarez/null-ls.nvim" + }, + ["nvim-autopairs"] = { + loaded = true, + path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-autopairs", + url = "https://github.com/windwp/nvim-autopairs" }, ["nvim-cmp"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-cmp" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" }, ["nvim-lsp-installer"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer", + url = "https://github.com/williamboman/nvim-lsp-installer" }, ["nvim-lsp-ts-utils"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-lsp-ts-utils" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-lsp-ts-utils", + url = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils" }, ["nvim-lspconfig"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-lspconfig" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" }, ["nvim-treesitter"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-treesitter" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" }, ["nvim-web-devicons"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-web-devicons" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + url = "https://github.com/kyazdani42/nvim-web-devicons" }, ["packer.nvim"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/packer.nvim" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" }, ["plenary.nvim"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/plenary.nvim" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/plenary.nvim", + url = "https://github.com/nvim-lua/plenary.nvim" }, ["ranger.vim"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/ranger.vim" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/ranger.vim", + url = "https://github.com/francoiscabrol/ranger.vim" }, semshi = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/semshi" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/semshi", + url = "https://github.com/numirias/semshi" }, ["vim-js"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-js" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-js", + url = "https://github.com/yuezk/vim-js" }, ["vim-jsx-improve"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-jsx-improve" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-jsx-improve", + url = "https://github.com/chemzqm/vim-jsx-improve" }, ["vim-jsx-pretty"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-jsx-pretty" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-jsx-pretty", + url = "https://github.com/maxmellon/vim-jsx-pretty" }, ["vim-python-pep8-indent"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-python-pep8-indent" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-python-pep8-indent", + url = "https://github.com/Vimjas/vim-python-pep8-indent" }, ["vim-table-mode"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-table-mode" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/vim-table-mode", + url = "https://github.com/dhruvasagar/vim-table-mode" }, ["yats.vim"] = { loaded = true, - path = "/home/guy/.local/share/nvim/site/pack/packer/start/yats.vim" + path = "/home/guy/.local/share/nvim/site/pack/packer/start/yats.vim", + url = "https://github.com/HerringtonDarkholme/yats.vim" } }