From f74e5e5d98648287054053f7b8b4e7d0911eb7a1 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Fri, 19 Jul 2024 15:01:52 +0300 Subject: [PATCH] feat(neovim): some plugins are now lazy loaded --- .config/nvim/lua/custom/plugins/alpha.lua | 9 ++++--- .config/nvim/lua/custom/plugins/lsp.lua | 11 ++------ .config/nvim/lua/custom/plugins/motions.lua | 25 +++++++------------ .../nvim/lua/custom/plugins/statusline.lua | 3 ++- .config/nvim/lua/custom/plugins/telescope.lua | 20 +++++++-------- .config/nvim/lua/custom/plugins/utility.lua | 7 +++--- 6 files changed, 31 insertions(+), 44 deletions(-) diff --git a/.config/nvim/lua/custom/plugins/alpha.lua b/.config/nvim/lua/custom/plugins/alpha.lua index e1b9532..72af0a5 100644 --- a/.config/nvim/lua/custom/plugins/alpha.lua +++ b/.config/nvim/lua/custom/plugins/alpha.lua @@ -1,8 +1,11 @@ return { 'goolord/alpha-nvim', - dependencies = { - 'nvim-tree/nvim-web-devicons', - }, + dependencies = { 'nvim-tree/nvim-web-devicons' }, + event = function() + if vim.fn.argc() == 0 then + return 'VimEnter' + end + end, config = function() local alpha = require('alpha') local dashboard = require('alpha.themes.dashboard') diff --git a/.config/nvim/lua/custom/plugins/lsp.lua b/.config/nvim/lua/custom/plugins/lsp.lua index 94ba58b..6f2f63c 100644 --- a/.config/nvim/lua/custom/plugins/lsp.lua +++ b/.config/nvim/lua/custom/plugins/lsp.lua @@ -16,15 +16,8 @@ return { 'nvimdev/lspsaga.nvim', dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, }, - { - 'folke/lazydev.nvim', - ft = 'lua', - opts = { library = { { path = 'luvit-meta/library', words = { 'vim%.uv' } } } }, - }, - { - 'ray-x/lsp_signature.nvim', - event = 'VeryLazy', - }, + { 'folke/lazydev.nvim', ft = 'lua' }, + { 'ray-x/lsp_signature.nvim', event = 'VeryLazy' }, -- AUtoformatting -- 'stevear/conform.nvim', diff --git a/.config/nvim/lua/custom/plugins/motions.lua b/.config/nvim/lua/custom/plugins/motions.lua index d4619c6..1b5e154 100644 --- a/.config/nvim/lua/custom/plugins/motions.lua +++ b/.config/nvim/lua/custom/plugins/motions.lua @@ -68,21 +68,14 @@ return { { 'kylechui/nvim-surround', version = '*', - event = 'VeryLazy', - config = function() - require('nvim-surround').setup({}) - vim.keymap.set('v', '(', '(nvim-surround-visual)(') - vim.keymap.set('v', ')', '(nvim-surround-visual))') - vim.keymap.set('v', '{', '(nvim-surround-visual){') - vim.keymap.set('v', '}', '(nvim-surround-visual)}') - -- I still want to be able to do < and > for indentation - -- vim.keymap.set('v', '<', '(nvim-surround-visual)<') - -- vim.keymap.set('v', '>', '(nvim-surround-visual)>') - vim.keymap.set('v', '[', '(nvim-surround-visual)[') - vim.keymap.set('v', ']', '(nvim-surround-visual)]') - vim.keymap.set('v', "'", "(nvim-surround-visual)'") - vim.keymap.set('v', '"', '(nvim-surround-visual)"') - vim.keymap.set('v', '`', '(nvim-surround-visual)`') - end, + config = true, + keys = { + { '(', '(nvim-surround-visual)(', mode = 'v' }, + { ')', '(nvim-surround-visual))', mode = 'v' }, + { '{', '(nvim-surround-visual){', mode = 'v' }, + { '}', '(nvim-surround-visual)}', mode = 'v' }, + { '[', '(nvim-surround-visual)[', mode = 'v' }, + { '`', '(nvim-surround-visual)`', mode = 'v' }, + }, }, } diff --git a/.config/nvim/lua/custom/plugins/statusline.lua b/.config/nvim/lua/custom/plugins/statusline.lua index 775fadb..8c37eab 100644 --- a/.config/nvim/lua/custom/plugins/statusline.lua +++ b/.config/nvim/lua/custom/plugins/statusline.lua @@ -2,6 +2,7 @@ return { 'nvim-lualine/lualine.nvim', dependencies = { 'nvim-tree/nvim-web-devicons', 'linrongbin16/lsp-progress.nvim' }, config = function() - require("custom.statusline") + require('custom.statusline') end, + event = 'BufWinEnter', } diff --git a/.config/nvim/lua/custom/plugins/telescope.lua b/.config/nvim/lua/custom/plugins/telescope.lua index 263cc1e..6de07d5 100644 --- a/.config/nvim/lua/custom/plugins/telescope.lua +++ b/.config/nvim/lua/custom/plugins/telescope.lua @@ -1,14 +1,12 @@ return { - { - 'nvim-telescope/telescope.nvim', - tag = '0.1.5', - dependencies = { - 'nvim-lua/plenary.nvim', - { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }, - 'nvim-telescope/telescope-ui-select.nvim', - }, - config = function() - require("custom.telescope") - end, + 'nvim-telescope/telescope.nvim', + tag = '0.1.5', + dependencies = { + 'nvim-lua/plenary.nvim', + { 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }, + 'nvim-telescope/telescope-ui-select.nvim', }, + config = function() + require('custom.telescope') + end, } diff --git a/.config/nvim/lua/custom/plugins/utility.lua b/.config/nvim/lua/custom/plugins/utility.lua index 79982b4..c658070 100644 --- a/.config/nvim/lua/custom/plugins/utility.lua +++ b/.config/nvim/lua/custom/plugins/utility.lua @@ -35,7 +35,7 @@ return { vim.keymap.set('n', '', session.search_session, { desc = '[S]ession Manager' }) end, }, - { 'wakatime/vim-wakatime', lazy = false }, + { 'wakatime/vim-wakatime', lazy = false }, { 'AckslD/nvim-neoclip.lua', dependencies = { @@ -73,9 +73,8 @@ return { end, }, -- NOTE: No keybindings, use `:Spectre` or `:Spectre ` - -- Spectre has no undo, so it should be rarely used, - -- which is why no keybindings are defined - { 'nvim-pack/nvim-spectre' }, + -- Spectre has no undo, so it should be rarely used, which is why no keybindings are defined + { 'nvim-pack/nvim-spectre', cmd = 'Spectre', config = true }, { 'echasnovski/mini.nvim', version = false,