From 7b4d55b6917a859328fc1b2d9dd4f727181fbddd Mon Sep 17 00:00:00 2001 From: long Date: Sat, 22 Feb 2025 19:54:59 -0600 Subject: [PATCH] moved from packer to lazy --- lazy-lock.json | 45 ++++++++++ lua/plugins/config.lua | 20 +++-- lua/plugins/init.lua | 31 ++++--- lua/plugins/lazy.lua | 116 ++++++++++++++++++++++++++ lua/plugins/{setup.lua => packer.lua} | 4 +- 5 files changed, 196 insertions(+), 20 deletions(-) create mode 100644 lazy-lock.json create mode 100644 lua/plugins/lazy.lua rename lua/plugins/{setup.lua => packer.lua} (97%) diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..bd748df --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,45 @@ +{ + "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, + "auto-session": { "branch": "main", "commit": "9c3f977aafb56bd73ba0d082c4dcbdba5666faf3" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "emmet-vim": { "branch": "master", "commit": "6c511a8d7d2863066f32e25543e2bb99d505172c" }, + "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, + "fzf": { "branch": "master", "commit": "bae196523189988d9d5fa2a13880f9b1f36dedf0" }, + "fzf-checkout.vim": { "branch": "master", "commit": "db0289a6c8e77b08a0150627733722fd07d5fa62" }, + "fzf.vim": { "branch": "master", "commit": "f06bd1e69b7e5c77dbdef40ca8d31292fc926d3c" }, + "gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" }, + "hop.nvim": { "branch": "master", "commit": "1a1eceafe54b5081eae4cb91c723abd1d450f34b" }, + "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, + "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" }, + "lsp-zero.nvim": { "branch": "v1.x", "commit": "aa36afcf7a59fbd98008c9a434593c423d3d649a" }, + "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, + "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, + "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, + "nvim-fzf": { "branch": "master", "commit": "305aa90aeb8409b4bd2af1812a4b6e157ee93953" }, + "nvim-fzf-commands": { "branch": "master", "commit": "52f9450cd69f462aa1ecc5dc3e05ef3b77840e4f" }, + "nvim-lspconfig": { "branch": "master", "commit": "6b63bdf2399b9bedf93297d98419550523a9ad68" }, + "nvim-treesitter": { "branch": "master", "commit": "5774e7d3da4f681296a87fcd85d17779ad362a4f" }, + "nvim-treesitter-context": { "branch": "master", "commit": "198720b4016af04c9590f375d714d5bf8afecc1a" }, + "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" }, + "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "rnvimr": { "branch": "main", "commit": "57f7a8edd629791557d1315463d9fb2e411a45f1" }, + "rustaceanvim": { "branch": "master", "commit": "f03035fa03ccb36cd26d0792c946fbacba1d1a39" }, + "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, + "undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" }, + "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, + "vim-js": { "branch": "master", "commit": "35d9e2ef4d31618237463e3bdf4811b2f8a0dec5" }, + "vim-jsx-improve": { "branch": "master", "commit": "b179bf9a3901ccc6afcaa3abc9c93bae450f3339" }, + "vim-jsx-pretty": { "branch": "master", "commit": "6989f1663cc03d7da72b5ef1c03f87e6ddb70b41" }, + "vim-razor": { "branch": "master", "commit": "305dd1db88c657c0c02effbee1a88048479bb0c4" }, + "vim-snippets": { "branch": "master", "commit": "f0a3184d9f90b96b044d5914625a25c554d7f301" }, + "yats.vim": { "branch": "master", "commit": "b325c449a2db4d9ee38aa441afa850a815982e8b" }, + "zig.vim": { "branch": "master", "commit": "f023e86b042c0d5bef68b9f0651144a6bf6d642e" } +} diff --git a/lua/plugins/config.lua b/lua/plugins/config.lua index 1e6a491..720b3eb 100644 --- a/lua/plugins/config.lua +++ b/lua/plugins/config.lua @@ -126,7 +126,7 @@ end function M.auto_session() require("auto-session").setup({ - auto_session_suppress_dirs = { "~/", "~/Projects" }, + auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" }, auto_session_use_git_branch = true, }) @@ -253,18 +253,26 @@ function M.nvim_treesitter() require("nvim-treesitter.configs").setup({ ensure_installed = { "python", - "lua", + + "html", + "css", "javascript", "typescript", "tsx", - "json", "svelte", - "vim", - "css", - "html", + "angular", + + "json", "query", + "bash", + "lua", + "vim", + "glimmer", + "templ", + "go", + "rust", }, highlight = { enable = true, diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index fe7d0ef..0d6ac15 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -1,24 +1,31 @@ -local setup = require("plugins.setup") +local package_manager = require("plugins.lazy") local config = require("plugins.config") -setup.install_packer() -setup.install_plugins() +package_manager.bootstrap() +package_manager.install_plugins() -config.auto_session() +-- KEEPING +config.rnvimr() config.fzf() config.fzf_checkout() ---config.harpoon() -config.hop() +config.nvim_fzf() +config.gitsigns() +config.auto_session() +config.undotree() config.indent_blankline() config.lualine() -config.nvim_autopairs() -config.nvim_fzf() config.nvim_treesitter() -config.rnvimr() config.tokyonight() -config.gitsigns() + +-- UPDATING +config.hop() +config.rustaceanvim() + +-- LSP STUFF +config.nvim_autopairs() config.luasnip() config.lsp_zero() config.null_ls() -config.undotree() -config.rustaceanvim() + +-- REMOVING +--config.harpoon() diff --git a/lua/plugins/lazy.lua b/lua/plugins/lazy.lua new file mode 100644 index 0000000..4cc97d5 --- /dev/null +++ b/lua/plugins/lazy.lua @@ -0,0 +1,116 @@ +local M = {} + +function M.bootstrap() + local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" + if vim.fn.isdirectory(lazypath) == 0 then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end + end + vim.opt.rtp:prepend(lazypath) +end + +function M.install_plugins() + require("lazy").setup({ + spec = { + -- NAVIGATION + "phaazon/hop.nvim", + + -- VIM THEMING + "folke/tokyonight.nvim", + + -- FILE MANAGEMENT + "junegunn/fzf", + "junegunn/fzf.vim", + "kevinhwang91/rnvimr", + "vijaymarupudi/nvim-fzf", + "vijaymarupudi/nvim-fzf-commands", + + -- SESSION + --"ThePrimeagen/harpoon", + "nvim-lua/plenary.nvim", + "rmagatti/auto-session", + "mbbill/undotree", + + -- GIT + "tpope/vim-fugitive", + "stsewd/fzf-checkout.vim", + "lewis6991/gitsigns.nvim", + + -- EDITOR + "lukas-reineke/indent-blankline.nvim", + { + "nvim-lualine/lualine.nvim", + dependencies = { "kyazdani42/nvim-web-devicons", lazy = true }, + }, + + -- LSP + --"p00f/nvim-ts-rainbow", + --"nvimtools/none-ls.nvim", + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + }, + "nvim-treesitter/nvim-treesitter-context", + "nvim-treesitter/playground", + "jose-elias-alvarez/null-ls.nvim", + "windwp/nvim-autopairs", + + { + "VonHeikemen/lsp-zero.nvim", + branch = "v1.x", + dependencies = { + -- LSP Support + { "neovim/nvim-lspconfig" }, -- Required + { "williamboman/mason.nvim" }, -- Optional + { "williamboman/mason-lspconfig.nvim" }, -- Optional + + -- Autocompletion + { "hrsh7th/nvim-cmp" }, -- Required + { "hrsh7th/cmp-nvim-lsp" }, -- Required + { "hrsh7th/cmp-buffer" }, -- Optional + { "hrsh7th/cmp-path" }, -- Optional + { "saadparwaiz1/cmp_luasnip" }, -- Optional + { "hrsh7th/cmp-nvim-lua" }, -- Optional + + -- Snippets + { "L3MON4D3/LuaSnip" }, -- Required + { "rafamadriz/friendly-snippets" }, -- Optional + { "honza/vim-snippets" }, -- Optional + }, + }, + + -- JS + "HerringtonDarkholme/yats.vim", + "chemzqm/vim-jsx-improve", + "yuezk/vim-js", -- js + "maxmellon/vim-jsx-pretty", -- react/tsx syntax highlight & indent + + -- HTML/CSS + "mattn/emmet-vim", + + -- ZIG + "ziglang/zig.vim", + + -- C# + "jlcrochet/vim-razor", + + -- RUST + { + "mrcjkb/rustaceanvim", + version = "^5", -- Recommended + lazy = false, -- This plugin is already lazy + }, + }, + }) +end + +return M diff --git a/lua/plugins/setup.lua b/lua/plugins/packer.lua similarity index 97% rename from lua/plugins/setup.lua rename to lua/plugins/packer.lua index 70ae599..e88a335 100644 --- a/lua/plugins/setup.lua +++ b/lua/plugins/packer.lua @@ -1,6 +1,6 @@ local M = {} -function M.install_packer() +function M.bootstrap() local fn = vim.fn local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" @@ -29,7 +29,7 @@ function M.install_plugins() use("vijaymarupudi/nvim-fzf-commands") -- SESSION - use("ThePrimeagen/harpoon") + --use("ThePrimeagen/harpoon") use("nvim-lua/plenary.nvim") use({ "rmagatti/auto-session",