From 4909a85b07191b9ddc1caa1c3fc33f1318099c47 Mon Sep 17 00:00:00 2001 From: Nikos Papadakis Date: Mon, 14 Aug 2023 00:14:41 +0300 Subject: [PATCH] nvim: lazy --- nvim/dot-config/nvim/init.lua | 16 ++++- nvim/dot-config/nvim/lazy-lock.json | 29 +++++++++ nvim/dot-config/nvim/lua/my/plugins.lua | 81 ++++++++++--------------- 3 files changed, 77 insertions(+), 49 deletions(-) create mode 100644 nvim/dot-config/nvim/lazy-lock.json diff --git a/nvim/dot-config/nvim/init.lua b/nvim/dot-config/nvim/init.lua index 2d13d57..7d28a72 100644 --- a/nvim/dot-config/nvim/init.lua +++ b/nvim/dot-config/nvim/init.lua @@ -14,7 +14,21 @@ vim.g.maplocalleader = " " vim.g.loaded_netrw = 1 vim.g.loaded_netrwPlugin = 1 -require "my.plugins" +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if vim.fn.empty(vim.fn.glob(lazypath)) == 1 then + print("installing lazy") + 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("my.plugins") + require "my.options" require "my.keymaps" diff --git a/nvim/dot-config/nvim/lazy-lock.json b/nvim/dot-config/nvim/lazy-lock.json new file mode 100644 index 0000000..e8e6062 --- /dev/null +++ b/nvim/dot-config/nvim/lazy-lock.json @@ -0,0 +1,29 @@ +{ + "LuaSnip": { "branch": "master", "commit": "99a94cc35ec99bf06263d0346128e908a204575c" }, + "catppuccin": { "branch": "main", "commit": "490078b1593c6609e6a50ad5001e7902ea601824" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "gitsigns.nvim": { "branch": "main", "commit": "bae45ef449d8811061cc940459e70e883a3aa83a" }, + "indent-blankline.nvim": { "branch": "master", "commit": "b7aa0aed55887edfaece23f7b46ab22232fc8741" }, + "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, + "lsp-format.nvim": { "branch": "master", "commit": "ca0df5c8544e51517209ea7b86ecc522c98d4f0a" }, + "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" }, + "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" }, + "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, + "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" }, + "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" }, + "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" }, + "nvim-lspconfig": { "branch": "master", "commit": "a981d4447b92c54a4d464eb1a76b799bc3f9a771" }, + "nvim-treesitter": { "branch": "master", "commit": "bc52938ddde0ff6b3d51ff215d2c66f2e39b7099" }, + "nvim-treesitter-context": { "branch": "master", "commit": "3d4ab25056dcaf6dd11ebacf1da8525c8df6550f" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "9e519b6146512c8e2e702faf8ac48420f4f5deec" }, + "nvim-web-devicons": { "branch": "master", "commit": "ab899311f8ae00a47eae8e0879506cead8eb1561" }, + "oil.nvim": { "branch": "master", "commit": "0138a2e0f9baacd98d5531ebb5078fafc5114fae" }, + "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" }, + "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, + "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" }, + "zk-nvim": { "branch": "main", "commit": "797618aa07f58ceba6f79fb6e777e8e45c51e1ce" } +} \ No newline at end of file diff --git a/nvim/dot-config/nvim/lua/my/plugins.lua b/nvim/dot-config/nvim/lua/my/plugins.lua index 0e76f82..5958789 100644 --- a/nvim/dot-config/nvim/lua/my/plugins.lua +++ b/nvim/dot-config/nvim/lua/my/plugins.lua @@ -1,57 +1,42 @@ -local function clone_paq() - local path = vim.fn.stdpath "data" .. "/site/pack/paqs/start/paq-nvim" - local is_installed = vim.fn.empty(vim.fn.glob(path)) == 0 - if not is_installed then - vim.fn.system { - "git", - "clone", - "--depth", - "1", - "https://github.com/savq/paq-nvim.git", - path, +return { + { + "nvim-telescope/telescope.nvim", + branch = "0.1.x", + dependencies = { + { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + "nvim-lua/plenary.nvim", } - return true - end -end - -local function bootstrap_paq(packages) - local first_install = clone_paq() - local paq = require("paq") - - paq(packages) - vim.cmd("packadd paq-nvim") - - if first_install then - paq.install() - end -end - -bootstrap_paq { - { "catppuccin/nvim", as = "catppuccin" }, - { "lukas-reineke/indent-blankline.nvim", branch = "v2.20.7" }, - { "lukas-reineke/lsp-format.nvim", branch = "v2.5.1" }, - { "nvim-telescope/telescope-fzf-native.nvim", run = "make" }, - { "nvim-telescope/telescope.nvim", branch = "0.1.x" }, - { "nvim-treesitter/nvim-treesitter", branch = "master" }, - { "stevearc/oil.nvim", branch = "v1.0.0" }, - { "williamboman/mason.nvim", branch = "v1.6.0" }, - "L3MON4D3/LuaSnip", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-cmdline", - "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-path", - "hrsh7th/nvim-cmp", + }, + { + "hrsh7th/nvim-cmp", + event = "InsertEnter", + dependencies = { + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-cmdline", + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-path", + "L3MON4D3/LuaSnip", + } + }, + { + "nvim-treesitter/nvim-treesitter", + dependencies = { + "nvim-treesitter/nvim-treesitter-context", + "nvim-treesitter/nvim-treesitter-textobjects", + "nvim-treesitter/playground", + } + }, + { "catppuccin/nvim", name = "catppuccin" }, + { "stevearc/oil.nvim", tag = "v1.0.0" }, + { "williamboman/mason.nvim", tag = "v1.6.2" }, + { "lukas-reineke/indent-blankline.nvim", tag = "v2.20.7" }, + { "lukas-reineke/lsp-format.nvim", tag = "v2.5.1" }, + { "nvim-tree/nvim-web-devicons", lazy = true }, "lewis6991/gitsigns.nvim", "mickael-menu/zk-nvim", "neovim/nvim-lspconfig", "nvim-lua/lsp-status.nvim", - "nvim-lua/plenary.nvim", "nvim-lualine/lualine.nvim", - "nvim-tree/nvim-web-devicons", - "nvim-treesitter/nvim-treesitter-context", - "nvim-treesitter/nvim-treesitter-textobjects", - "nvim-treesitter/playground", "onsails/lspkind.nvim", - "savq/paq-nvim", "windwp/nvim-autopairs", }