From 8918eeb8b409a85b809f31e8026bdfc42693e210 Mon Sep 17 00:00:00 2001 From: QQ <1770362456@qq.com> Date: Sun, 19 Mar 2023 00:22:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86packer=E8=BF=81=E7=A7=BB=E5=88=B0lazy.?= =?UTF-8?q?nvim?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/G.lua | 1 + lua/core/plug.lua | 74 +++++++------- plugin/packer_compiled.lua | 199 ------------------------------------- 3 files changed, 38 insertions(+), 236 deletions(-) delete mode 100644 plugin/packer_compiled.lua diff --git a/lua/G.lua b/lua/G.lua index 1944861..cd43cd2 100644 --- a/lua/G.lua +++ b/lua/G.lua @@ -6,6 +6,7 @@ G.o = vim.o G.fn = vim.fn G.api = vim.api G.opt = vim.opt +G.loop = vim.loop function G.map(maps) for _,map in pairs(maps) do diff --git a/lua/core/plug.lua b/lua/core/plug.lua index b8e0fdf..0824f0d 100644 --- a/lua/core/plug.lua +++ b/lua/core/plug.lua @@ -1,54 +1,54 @@ local G = require('G') -local ensure_packer = function() - local fn = G.fn - local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' - if fn.empty(fn.glob(install_path)) > 0 then - fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path}) - G.cmd [[packadd packer.nvim]] - G.cmd [[PackerSync]] - return true - end - return false + +local lazypath = G.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not G.loop.fs_stat(lazypath) then + G.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end -local packer_bootstrap = ensure_packer() +G.opt.rtp:prepend(lazypath) -return require('packer').startup(function(use) +-- Example using a list of specs with the default options - -- 防止被自己clean - use 'wbthomason/packer.nvim' +require("lazy").setup({ + lockfile = false, - -- 主题插件 - use 'nvim-lualine/lualine.nvim' - use 'morhetz/gruvbox' - use 'yaocccc/nvim-hlchunk' + -- 主题插件 + 'nvim-lualine/lualine.nvim', + 'morhetz/gruvbox', + 'yaocccc/nvim-hlchunk', - -- lsp 补全以及语法高亮 - use {'neoclide/coc.nvim', branch = 'release'} - use 'nvim-treesitter/nvim-treesitter' + -- lsp 补全以及语法高亮 + {'neoclide/coc.nvim', branch = 'release'}, + 'nvim-treesitter/nvim-treesitter', - -- surround 和 wildfire 配合有神奇的效果 - use 'tpope/vim-surround' - use 'gcmt/wildfire.vim' + -- surround 和 wildfire 配合有神奇的效果 + 'tpope/vim-surround', + 'gcmt/wildfire.vim', - -- 格式整理 - use 'junegunn/vim-easy-align' - use 'tpope/vim-commentary' + -- 格式整理 + 'junegunn/vim-easy-align', + 'tpope/vim-commentary', - --颜色识别 - use 'lilydjwg/colorizer' + --颜色识别 + 'lilydjwg/colorizer', - --markdown - use 'iamcco/markdown-preview.nvim' + --markdown + 'iamcco/markdown-preview.nvim', - -- 文件搜索 - use {'junegunn/fzf'} + -- 文件搜索 + 'junegunn/fzf', - -- 多光标 - use 'terryma/vim-multiple-cursors' + -- 多光标 + 'terryma/vim-multiple-cursors', - -end) + }) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua deleted file mode 100644 index 4bb1635..0000000 --- a/plugin/packer_compiled.lua +++ /dev/null @@ -1,199 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - -_G._packer = _G._packer or {} -_G._packer.inside_compile = true - -local time -local profile_info -local should_profile = false -if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end -else - time = function(chunk, start) end -end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - if threshold then - table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') - end - - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/newbie/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/newbie/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/newbie/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/newbie/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/newbie/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - ale = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/ale", - url = "https://github.com/dense-analysis/ale" - }, - ["coc.nvim"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/coc.nvim", - url = "https://github.com/neoclide/coc.nvim" - }, - colorizer = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/colorizer", - url = "https://github.com/lilydjwg/colorizer" - }, - fzf = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/fzf", - url = "https://github.com/junegunn/fzf" - }, - gruvbox = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/gruvbox", - url = "https://github.com/morhetz/gruvbox" - }, - ["lazygit.nvim"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/lazygit.nvim", - url = "https://github.com/kdheepak/lazygit.nvim" - }, - ["lualine.nvim"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/lualine.nvim", - url = "https://github.com/nvim-lualine/lualine.nvim" - }, - ["markdown-preview.nvim"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/markdown-preview.nvim", - url = "https://github.com/iamcco/markdown-preview.nvim" - }, - ["nvim-hlchunk"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/nvim-hlchunk", - url = "https://github.com/yaocccc/nvim-hlchunk" - }, - ["nvim-treesitter"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - }, - ["tree-sitter-javascript"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/tree-sitter-javascript", - url = "https://github.com/tree-sitter/tree-sitter-javascript" - }, - ["tree-sitter-vue"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/tree-sitter-vue", - url = "https://github.com/tree-sitter/tree-sitter-vue" - }, - ["vim-commentary"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vim-commentary", - url = "https://github.com/tpope/vim-commentary" - }, - ["vim-easy-align"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vim-easy-align", - url = "https://github.com/junegunn/vim-easy-align" - }, - ["vim-easymotion"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vim-easymotion", - url = "https://github.com/easymotion/vim-easymotion" - }, - ["vim-multiple-cursors"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vim-multiple-cursors", - url = "https://github.com/terryma/vim-multiple-cursors" - }, - ["vim-surround"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vim-surround", - url = "https://github.com/tpope/vim-surround" - }, - ["vim-vue"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vim-vue", - url = "https://github.com/posva/vim-vue" - }, - vimwiki = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/vimwiki", - url = "https://github.com/vimwiki/vimwiki" - }, - ["wildfire.vim"] = { - loaded = true, - path = "/home/newbie/.local/share/nvim/site/pack/packer/start/wildfire.vim", - url = "https://github.com/gcmt/wildfire.vim" - } -} - -time([[Defining packer_plugins]], false) - -_G._packer.inside_compile = false -if _G._packer.needs_bufread == true then - vim.cmd("doautocmd BufRead") -end -_G._packer.needs_bufread = false - -if should_profile then save_profiles() end - -end) - -if not no_errors then - error_msg = error_msg:gsub('"', '\\"') - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end