From 4372d8a2b0caed85f4827a8b00a30dd5f9186084 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 30 Nov 2023 12:55:27 +0800 Subject: [PATCH] Update Signed-off-by: Ryan --- lazy-lock.json | 10 ++++---- lua/lazy-plugins.lua | 52 ++++++++++++++++++++++----------------- lua/plugins/cmp.lua | 8 ------ lua/plugins/telescope.lua | 2 +- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 77807eb..020e717 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -6,27 +6,26 @@ "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, - "cmp-treesitter": { "branch": "master", "commit": "b8bc760dfcc624edd5454f0982b63786a822eed9" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, "dressing.nvim": { "branch": "master", "commit": "fe3071330a0720ce3695ac915820c8134b22d1b0" }, "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "gitmoji.nvim": { "branch": "main", "commit": "326ddf01cbf3425566a089126ece7e8bd2560601" }, "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, - "gruvbox.nvim": { "branch": "main", "commit": "517b012757fbe7a4d6e507baf5cc75837e62734f" }, + "gruvbox.nvim": { "branch": "main", "commit": "0940564208a490c173216c3b7d2188b0a5ad3491" }, "killersheep.nvim": { "branch": "master", "commit": "506823c47b854df02e78d5fec9468ab0e542dcf5" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "41674c9d50f23cfa3e11f0ca964eb9100c2a8922" }, "mason-null-ls.nvim": { "branch": "main", "commit": "d1f7258f80867f718d643d88eee66959671a4bef" }, "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, + "neogen": { "branch": "main", "commit": "70127baaff25611deaf1a29d801fc054ad9d2dc1" }, "neogit": { "branch": "master", "commit": "bb538f12fa032c97d4632a6df71d5e0704088139" }, - "none-ls.nvim": { "branch": "main", "commit": "fc0f6013ced00fbd61a1ee079427ad445eea0e4b" }, - "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, + "none-ls.nvim": { "branch": "main", "commit": "3a4826687da4310af379515086d71faca4d21288" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-lspconfig": { "branch": "master", "commit": "39546f730bdff8eccf7cec344cfce694f19ac908" }, - "nvim-treesitter": { "branch": "master", "commit": "8f16c39f5b439bd9540336c4d5da705d180e34b9" }, + "nvim-treesitter": { "branch": "master", "commit": "e9acd01a4a1f6e584f76e736987f4c31401aa4b1" }, "nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" }, "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" }, "plenary.nvim": { "branch": "master", "commit": "366b0837486f60ae0e7550c15de8ff66d057c4cd" }, @@ -35,6 +34,7 @@ "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, "telescope.nvim": { "branch": "master", "commit": "84c5a71d825b6687a55aed6f41e98b92fd8e5454" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "3b8c8b153b54b2cb86dc6fcc547264a84c31f775" }, "vim-matchup": { "branch": "master", "commit": "269f9bea87e20a01438085eb13df539929a12727" }, "vim-sandwich": { "branch": "master", "commit": "c5a2cc438ce6ea2005c556dc833732aa53cae21a" } } \ No newline at end of file diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index 45dd695..d435337 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -72,7 +72,6 @@ local plugins = { "hrsh7th/cmp-nvim-lua", "hrsh7th/cmp-cmdline", "FelipeLema/cmp-async-path", - "ray-x/cmp-treesitter", { "saadparwaiz1/cmp_luasnip", dependencies = { @@ -85,15 +84,6 @@ local plugins = { require("plugins/cmp") end }, - { - "windwp/nvim-autopairs", - event = "InsertEnter", - opts = { - map_c_w = true, - enable_check_bracket_line = true, - check_ts = true, - }, - }, { "Dynge/gitmoji.nvim", ft = { "gitcommit", "NeogitCommitMessage" }, @@ -162,23 +152,13 @@ local plugins = { event = "CmdlineEnter", keys = { vim.keymap.set('', 'tf', ':Telescope fd'), - vim.keymap.set('', 'tg', ':Telescope live_grep'), + vim.keymap.set('', 't/', ':Telescope live_grep'), vim.keymap.set('', 'tb', ':Telescope buffers'), }, config = function() require("plugins.telescope") end }, - { - "NeogitOrg/neogit", - dependencies = { - "nvim-lua/plenary.nvim", -- required - "nvim-telescope/telescope.nvim", -- optional - "sindrets/diffview.nvim", -- optional - }, - cmd = { "Neogit", "NeogitResetState" }, - config = true - }, { "folke/trouble.nvim", lazy = true, @@ -195,6 +175,21 @@ local plugins = { }, dependencies = { "nvim-tree/nvim-web-devicons" }, }, + { + "danymat/neogen", + dependencies = "nvim-treesitter/nvim-treesitter", + cmd = "Neogen", + opts = { + snippet_engine = "luasnip" + }, + config = true, + }, + { + 'altermo/ultimate-autopair.nvim', + event = { 'InsertEnter', 'CmdlineEnter' }, + opts = { + }, + }, -- Eye candy UI { @@ -259,7 +254,20 @@ local plugins = { { "seandewar/killersheep.nvim", cmd = "KillKillKill" - } + }, + { + "NeogitOrg/neogit", + dependencies = { + "nvim-lua/plenary.nvim", -- required + "nvim-telescope/telescope.nvim", -- optional + "sindrets/diffview.nvim", -- optional + }, + cmd = { "Neogit", "NeogitResetState" }, + keys = { + vim.keymap.set("n", "ng", ":Neogit") + }, + config = true + }, } local vscode_plugins = { diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index cf650f8..8851b08 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -92,11 +92,3 @@ cmp.setup.cmdline(':', { } }) }) - --- nvim-cmp --- If you want insert `(` after select function or method item -local cmp_autopairs = require('nvim-autopairs.completion.cmp') -cmp.event:on( - 'confirm_done', - cmp_autopairs.on_confirm_done() -) diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 34f62b4..5fbeb67 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -3,7 +3,7 @@ local trouble = require("trouble.providers.telescope") require('telescope').setup { defaults = { layout_strategy = 'flex', - layout_config = { flip_columns = 144}, + layout_config = { flex = { flip_columns = 144 } }, mappings = { i = { [""] = trouble.open_with_trouble }, n = { [""] = trouble.open_with_trouble },