From 4b8284063c8ea0a0eab0b8128fff7b01f1681d5c Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Thu, 21 Sep 2023 08:25:25 -0400 Subject: [PATCH] Swap nvim package managers --- nvim/.config/nvim/lazy-lock.json | 20 ++++++++ nvim/.config/nvim/lua/plugins.lua | 79 ++++++++++++------------------- 2 files changed, 50 insertions(+), 49 deletions(-) create mode 100644 nvim/.config/nvim/lazy-lock.json diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json new file mode 100644 index 0000000..854e8ef --- /dev/null +++ b/nvim/.config/nvim/lazy-lock.json @@ -0,0 +1,20 @@ +{ + "NeoZoom.lua": { "branch": "main", "commit": "1289b900bd478fd135dcc0faf4a43b3cf7524097" }, + "bufdelete.nvim": { "branch": "master", "commit": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4" }, + "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" }, + "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" }, + "gitsigns.nvim": { "branch": "main", "commit": "bce4576a9047085a528c479a7fe1e2f6b787b6c1" }, + "gruvbox": { "branch": "master", "commit": "86c767ff91e2518da44ba8c78b3bc6c979cf5403" }, + "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, + "nvim-surround": { "branch": "main", "commit": "1c2ef599abeeb98e40706830bcd27e90e259367a" }, + "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" }, + "telescope.nvim": { "branch": "master", "commit": "40c8d2fc2b729dd442eda093cf8c9496d6e23732" }, + "typescript-vim": { "branch": "master", "commit": "31ede5ad905ce4159a5e285073a391daa3bf83fa" }, + "vim-eunuch": { "branch": "master", "commit": "67f3dd32b4dcd1c427085f42ff5f29c7adc645c6" }, + "vim-go": { "branch": "master", "commit": "a2e59981a2d965bed9f4052fa15a08d2ee2f8040" }, + "vim-markdown": { "branch": "master", "commit": "f2b82b7884a3d8bde0c5de7793b27e07030eb2bc" }, + "vim-rails": { "branch": "master", "commit": "1ad9663ce31e8c08134849d04184cda94bb42aba" }, + "vim-ruby": { "branch": "master", "commit": "88f29671b776fff56e5ee554becf34dd2ee1975c" }, + "vim-terraform": { "branch": "master", "commit": "2bbc5f65a80c79a5110494a2ba1b869075fcf7a0" }, + "whitespace.nvim": { "branch": "master", "commit": "fe9ca0ba3c6e6cc1dd14c0d6cbe49d97496700dd" } +} \ No newline at end of file diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua index 94c07a8..137d329 100644 --- a/nvim/.config/nvim/lua/plugins.lua +++ b/nvim/.config/nvim/lua/plugins.lua @@ -1,53 +1,34 @@ -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) +require("lazy").setup({ + "nvim-lua/plenary.nvim", + "nvim-telescope/telescope.nvim", + "famiu/bufdelete.nvim", + "gpanders/editorconfig.nvim", + "johnfrankmorgan/whitespace.nvim", + "kylechui/nvim-surround", + "lewis6991/gitsigns.nvim", + "nyngwang/NeoZoom.lua", -- TODO: Floating window background color + "ruifm/gitlinker.nvim", + "tpope/vim-eunuch", -local packer_bootstrap = ensure_packer() - -return require('packer').startup(function(use) - local use = use - - use "wbthomason/packer.nvim" - -- TODO: autoupdate (but after plugins separate file - -- augroup packer_user_config - -- autocmd! - -- autocmd BufWritePost plugins.lua source | PackerCompile - -- augroup end - - use "nvim-lua/plenary.nvim" - use "nvim-telescope/telescope.nvim" - - use "famiu/bufdelete.nvim" - use "gpanders/editorconfig.nvim" - use "johnfrankmorgan/whitespace.nvim" - use "kylechui/nvim-surround" - use "lewis6991/gitsigns.nvim" - use "nyngwang/NeoZoom.lua" -- TODO: Floating window background color - use "ruifm/gitlinker.nvim" - use "tpope/vim-eunuch" - - use "gruvbox-community/gruvbox" + "gruvbox-community/gruvbox", -- languages - use "fatih/vim-go" - use "hashivim/vim-terraform" - use "leafgarland/typescript-vim" - use "tpope/vim-markdown" - use "tpope/vim-rails" - use "vim-ruby/vim-ruby" - - if packer_bootstrap then - require('packer').sync() - end -end) + "fatih/vim-go", + "hashivim/vim-terraform", + "leafgarland/typescript-vim", + "tpope/vim-markdown", + "tpope/vim-rails", + "vim-ruby/vim-ruby", +})