From 66c9b0f63220d6e7f6e2e858e80f3cb83539cd50 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 31 Dec 2023 16:03:13 +0000 Subject: Replaces Packer with lazy --- lua/core/plugins.lua | 60 ++++++++--------- plugin/packer_compiled.lua | 165 --------------------------------------------- 2 files changed, 27 insertions(+), 198 deletions(-) delete mode 100644 plugin/packer_compiled.lua diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua index 7d8c3c1..3fcbdec 100644 --- a/lua/core/plugins.lua +++ b/lua/core/plugins.lua @@ -1,38 +1,38 @@ -local ensure_packer = function() - local fn = vim.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}) - vim.cmd [[packadd packer.nvim]] - return true - end - return false +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not vim.loop.fs_stat(lazypath) then + vim.fn.system({ + "git", + "clone", + "--filter=blob:none", + "https://github.com/folke/lazy.nvim.git", + "--branch=stable", -- latest stable release + lazypath, + }) end +vim.opt.rtp:prepend(lazypath) -local packer_bootstrap = ensure_packer() - -return require('packer').startup(function(use) - use 'wbthomason/packer.nvim' +require("lazy").setup({ + 'wbthomason/packer.nvim', -- Telescope and deps - use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } - use 'nvim-telescope/telescope-symbols.nvim' - use { - 'nvim-telescope/telescope.nvim', tag = '0.1.5', - requires = { {'nvim-lua/plenary.nvim'} } - } + { 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate' }, + 'nvim-telescope/telescope-symbols.nvim', + { + 'nvim-telescope/telescope.nvim', version = '0.1.5', + dependencies = { {'nvim-lua/plenary.nvim'} } + }, -- color scheme - use({ 'rose-pine/neovim', as = 'rose-pine' }) + { 'rose-pine/neovim', name = 'rose-pine' }, -- visual undo - use 'mbbill/undotree' + 'mbbill/undotree', -- lsp - use { + { 'VonHeikemen/lsp-zero.nvim', branch = 'v3.x', - requires = { + dependencies = { --- Uncomment these if you want to manage LSP servers from neovim -- {'williamboman/mason.nvim'}, -- {'williamboman/mason-lspconfig.nvim'}, @@ -44,16 +44,10 @@ return require('packer').startup(function(use) {'hrsh7th/cmp-nvim-lsp'}, {'L3MON4D3/LuaSnip'}, } - } + }, - use { + { 'nvim-lualine/lualine.nvim', - requires = { 'nvim-tree/nvim-web-devicons', opt = true } + dependencies = { 'nvim-tree/nvim-web-devicons', lazy = true } } - - -- Automatically set up your configuration after cloning packer.nvim - -- Put this at the end after all plugins - if packer_bootstrap then - require('packer').sync() - end -end) +}) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua deleted file mode 100644 index 1d91a26..0000000 --- a/plugin/packer_compiled.lua +++ /dev/null @@ -1,165 +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 = "/Users/ngharo/.cache/nvim/packer_hererocks/2.1.1700008891/share/lua/5.1/?.lua;/Users/ngharo/.cache/nvim/packer_hererocks/2.1.1700008891/share/lua/5.1/?/init.lua;/Users/ngharo/.cache/nvim/packer_hererocks/2.1.1700008891/lib/luarocks/rocks-5.1/?.lua;/Users/ngharo/.cache/nvim/packer_hererocks/2.1.1700008891/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/Users/ngharo/.cache/nvim/packer_hererocks/2.1.1700008891/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 = { - LuaSnip = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/LuaSnip", - url = "https://github.com/L3MON4D3/LuaSnip" - }, - ["cmp-nvim-lsp"] = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", - url = "https://github.com/hrsh7th/cmp-nvim-lsp" - }, - ["lsp-zero.nvim"] = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim", - url = "https://github.com/VonHeikemen/lsp-zero.nvim" - }, - ["lualine.nvim"] = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/lualine.nvim", - url = "https://github.com/nvim-lualine/lualine.nvim" - }, - ["nvim-cmp"] = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/nvim-cmp", - url = "https://github.com/hrsh7th/nvim-cmp" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", - url = "https://github.com/neovim/nvim-lspconfig" - }, - ["nvim-treesitter"] = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/nvim-treesitter", - url = "https://github.com/nvim-treesitter/nvim-treesitter" - }, - ["nvim-web-devicons"] = { - loaded = false, - needs_bufread = false, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons", - url = "https://github.com/nvim-tree/nvim-web-devicons" - }, - ["packer.nvim"] = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/plenary.nvim", - url = "https://github.com/nvim-lua/plenary.nvim" - }, - ["rose-pine"] = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/rose-pine", - url = "https://github.com/rose-pine/neovim" - }, - ["telescope-symbols.nvim"] = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/telescope-symbols.nvim", - url = "https://github.com/nvim-telescope/telescope-symbols.nvim" - }, - ["telescope.nvim"] = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/telescope.nvim", - url = "https://github.com/nvim-telescope/telescope.nvim" - }, - undotree = { - loaded = true, - path = "/Users/ngharo/.local/share/nvim/site/pack/packer/start/undotree", - url = "https://github.com/mbbill/undotree" - } -} - -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 -- cgit v1.2.3