WIP: Untested migration to Lazy.nvim

neovim/lua/plugins.lua

@@ -1,11 +1,19 @@
--- Install packer
 local utils = require("utils")
-local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/opt/packer.nvim"
+-- Lazy requires v0.8+
-local packer_bootstrap = ""
+
-if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
+-- Install Lazy.nvim
-    packer_bootstrap = vim.fn.system({ "git", "clone", "https://github.com/wbthomason/packer.nvim", install_path })
+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.cmd("packadd packer.nvim")
+vim.opt.rtp:prepend(lazypath)
 
 -- Configures dark-notify to use colors from my environment
 local function config_dark_notify()
@@ -17,422 +25,365 @@ local function config_dark_notify()
     })
 end
 
-local packer = require("packer")
-local packer_util = require("packer.util")
-local use = packer.use
-
-packer.init({
-    -- Always load default
-    snapshot = utils.map_version_rule({
-        [">=0.9.0"] = "latest-0.9",
-        [">=0.8.0"] = "latest-0.8",
-        [">=0.7.0"] = "latest-0.7",
-        [">=0.5.0"] = "latest",
-    }),
-    snapshot_path = packer_util.join_paths(vim.fn.stdpath("config"), "packer_snapshots"),
-    display = {
-        open_fn = function()
-            return packer_util.float({ border = "single" })
-        end,
-    },
-})
-
--- Load things faster!
 if vim.fn.has("nvim-0.9.0") == 1 then
-    -- Not needed on nvim 0.9+
     vim.loader.enable()
-else
-    use({
-        "lewis6991/impatient.nvim",
-        config = [[require('impatient')]],
-        tag = utils.map_version_rule({
-            [">=0.7.0"] = utils.nil_val,
-            [">0.6.0"] = "v0.2",
-            [">=0.5.0"] = "v0.1",
-        }),
-    })
 end
 
--- Let Packer manage and lazyload itself
+require("lazy").setup({
-use({
+    {
-    "wbthomason/packer.nvim",
+        -- Load faster!
-    cmd = {
+        "lewis6991/impatient.nvim",
-        "PackerClean",
+        config = function()
-        "PackerCompile",
+            require("impatient")
-        "PackerInstall",
+        end,
-        "PackerLoad",
+        enabled = vim.fn.has("nvim-0.9.0") ~= 1,
-        "PackerProfile",
+        lazy = false,
-        "PackerSnapshot",
+        priority = 1001,
-        "PackerSnapshotDelete",
-        "PackerSnapshotRollback",
-        "PackerStatus",
-        "PackerSync",
-        "PackerUpdate",
     },
-    config = [[require("plugins")]],
+    {
-})
+        "mhinz/vim-startify",
-
+        config = function()
--- Colorschemes
+            require("utils").require_with_local("plugins.startify")
-use({
+        end,
-    "vim-scripts/wombat256.vim",
+        priority = 100,
+    },
+    -- Colorschemes
     {
         "ViViDboarder/wombat.nvim",
-        requires = {
+        dependencies = {
-            {
+            "rktjmp/lush.nvim",
-                "rktjmp/lush.nvim",
-                tag = utils.map_version_rule({
-                    [">=0.7.0"] = utils.nil_val,
-                    [">=0.5.0"] = "v1.0.1",
-                }),
-            },
         },
+        lazy = false,
+        priority = 1000,
+    },
+    {
+        "ViViDboarder/wombuddy.nvim",
+        dependencies = {
+            "tjdevries/colorbuddy.vim",
+        },
+        lazy = false,
+        priority = 1000,
+    },
+    {
+        "ishan9299/nvim-solarized-lua",
+        lazy = false,
+        priority = 1000,
     },
-    { "ViViDboarder/wombuddy.nvim", requires = "tjdevries/colorbuddy.vim" },
-    "ishan9299/nvim-solarized-lua",
     {
         "folke/tokyonight.nvim",
-        run = 'fish -c \'echo "set --path --prepend fish_themes_path "(pwd)"/extras" > ~/.config/fish/conf.d/tokyonight.fish\' || true', -- luacheck: no max line length
+        -- TODO: Maybe not do this if already present?
+        build = 'fish -c \'echo "set --path --prepend fish_themes_path "(pwd)"/extras" > ~/.config/fish/conf.d/tokyonight.fish\' || true', -- luacheck: no max line length
     },
-})
+    {
-
+        "folke/which-key.nvim",
--- Auto and ends to some ifs and dos
+        config = function()
-use("tpope/vim-endwise")
+            require("plugins.whichkey").configure()
-
+        end,
--- Unix commands from vim? Yup!
+        lazy = true,
-use("tpope/vim-eunuch")
-
--- Adds repeats for custom motions
-use("tpope/vim-repeat")
-
--- Readline shortcuts
-use("tpope/vim-rsi")
-
--- Surround motions
-use("tpope/vim-surround")
-
--- Better netrw
-use("tpope/vim-vinegar")
-
--- Easier jumping to lines
-use("vim-scripts/file-line")
-
--- Auto ctags generation
-use("ludovicchabant/vim-gutentags")
-
--- Make it easier to discover some of my keymaps
-use({
-    "folke/which-key.nvim",
-    config = function()
-        require("plugins.whichkey").configure()
-    end,
-})
-
--- Better commenting
-use({
-    "tomtom/tcomment_vim",
-    config = function()
-        vim.api.nvim_set_keymap("n", "//", ":TComment<CR>", { silent = true, noremap = true })
-        vim.api.nvim_set_keymap("v", "//", ":TCommentBlock<CR>", { silent = true, noremap = true })
-    end,
-})
-
--- Allow wrapping and joining of arguments across multiple lines
-use({
-    "FooSoft/vim-argwrap",
-    config = function()
-        vim.api.nvim_set_keymap("n", "<Leader>a", "<cmd>ArgWrap<CR>", { silent = true, noremap = true })
-    end,
-})
-
--- Adds git operations to vim
-use({
-    "tpope/vim-fugitive",
-    config = function()
-        local opts = { silent = true, noremap = true }
-        vim.api.nvim_set_keymap("n", "gb", "<cmd>Git blame<CR>", opts)
-        vim.api.nvim_set_keymap("n", "gc", "<cmd>Git commit<CR>", opts)
-        vim.api.nvim_set_keymap("n", "gd", "<cmd>Git diff<CR>", opts)
-        vim.api.nvim_set_keymap("n", "gs", "<cmd>Git<CR>", opts)
-        vim.api.nvim_set_keymap("n", "gw", "<cmd>Git write<CR>", opts)
-    end,
-})
-
--- Quick toggling of Location and Quickfix lists
-use({
-    "milkypostman/vim-togglelist",
-    config = function()
-        vim.api.nvim_set_keymap("n", "<F6>", ":call ToggleQuickfixList()<CR>", { silent = true, noremap = true })
-        vim.api.nvim_set_keymap("n", "<F7>", ":call ToggleLocationList()<CR>", { silent = true, noremap = true })
-    end,
-})
-
--- Find text everywhere!
-use({
-    "mhinz/vim-grepper",
-    config = function()
-        require("plugins.grepper")
-    end,
-})
-
--- Highlight inline colors
-use({
-    "norcalli/nvim-colorizer.lua",
-    config = function()
-        require("colorizer").setup()
-    end,
-})
-
--- Custom status line
-use({
-    "SmiteshP/nvim-gps",
-    requires = "nvim-treesitter/nvim-treesitter",
-    disable = vim.fn.has("nvim-0.7.0") == 1,
-})
--- Replaces gps for 0.7+
-use({
-    "SmiteshP/nvim-navic",
-    requires = "neovim/nvim-lspconfig",
-    disable = vim.fn.has("nvim-0.7.0") ~= 1,
-})
-
-use({
-    "nvim-lualine/lualine.nvim",
-    config = function()
-        require("plugins.lualine").config_lualine()
-    end,
-    after = vim.fn.has("nvim-0.7.0") == 1 and "nvim-navic" or "nvim-gps",
-})
-
--- On Mac, update colors when dark mode changes
-use({
-    "cormacrelf/dark-notify",
-    disable = not vim.g.is_mac,
-    -- Download latest release on install
-    run = "curl -s https://api.github.com/repos/cormacrelf/dark-notify/releases/latest | jq '.assets[].browser_download_url' | xargs curl -Ls | tar xz -C ~/.local/bin/", -- luacheck: no max line length
-    config = config_dark_notify,
-    requires = "nvim-lualine/lualine.nvim",
-})
-
--- Custom start screen
-use({
-    "mhinz/vim-startify",
-    config = function()
-        require("utils").require_with_local("plugins.startify")
-    end,
-})
-
--- LSP
-
--- Configure language servers
-use({
-    "neovim/nvim-lspconfig",
-    tag = utils.map_version_rule({
-        -- [">=0.8.0"] = utils.nil_val,
-        [">=0.7.0"] = "v0.1.6",
-        [">=0.6.1"] = "v0.1.2",
-        [">=0.6.0"] = "v0.1.0",
-    }),
-})
-
--- Install language servers
-use({
-    "williamboman/mason.nvim",
-    requires = {
-        "neovim/nvim-lspconfig",
-        "williamboman/mason-lspconfig.nvim",
     },
-    -- Only supports >=0.7.0
-    disable = vim.fn.has("nvim-0.7.0") ~= 1,
-})
 
--- Lua dev for vim
+    -- Auto and ends to some ifs and dos
-use({
+    "tpope/vim-endwise",
-    "folke/neodev.nvim",
+    -- Unix commands from vim? Yup!
-    requires = "neovim/nvim-lspconfig",
+    "tpope/vim-eunuch",
-})
+    -- Adds repeats for custom motions
+    "tpope/vim-repeat",
+    -- Readline shortcuts
+    "tpope/vim-rsi",
+    -- Surround motions
+    "tpope/vim-surround",
+    -- Better netrw
+    "tpope/vim-vinegar",
+    -- Easier jumping to lines
+    "vim-scripts/file-line",
+    -- Auto ctags generation
+    "ludovicchabant/vim-gutentags",
+    {
+        -- Better commenting
+        "tomtom/tcomment_vim",
+        config = function()
+            -- TODO: use which-key for mapping
+            vim.api.nvim_set_keymap("n", "//", ":TComment<CR>", { silent = true, noremap = true })
+            vim.api.nvim_set_keymap("v", "//", ":TCommentBlock<CR>", { silent = true, noremap = true })
+        end,
+    },
 
--- Better display of lsp diagnostics
+    {
-use("folke/trouble.nvim")
+        -- Allow wrapping and joining of arguments across multiple lines
-
+        "FooSoft/vim-argwrap",
--- Incremental lsp rename view
+        config = function()
-use({
+            vim.api.nvim_set_keymap("n", "<Leader>a", "<cmd>ArgWrap<CR>", { silent = true, noremap = true })
-    "smjonas/inc-rename.nvim",
+        end,
-    config = function()
+    },
-        require("inc_rename").setup()
+    {
-    end,
+        -- Adds git operations to vim
-    -- Only supports >=0.8.0
+        "tpope/vim-fugitive",
-    disable = vim.fn.has("nvim-0.8.0") ~= 1,
+        config = function()
-})
+            local opts = { silent = true, noremap = true }
-
+            vim.api.nvim_set_keymap("n", "gb", "<cmd>Git blame<CR>", opts)
--- Generic linter/formatters in diagnostics API
+            vim.api.nvim_set_keymap("n", "gc", "<cmd>Git commit<CR>", opts)
-use({
+            vim.api.nvim_set_keymap("n", "gd", "<cmd>Git diff<CR>", opts)
-    "jose-elias-alvarez/null-ls.nvim",
+            vim.api.nvim_set_keymap("n", "gs", "<cmd>Git<CR>", opts)
-    branch = utils.map_version_rule({
+            vim.api.nvim_set_keymap("n", "gw", "<cmd>Git write<CR>", opts)
-        [">=0.8.0"] = utils.nil_val,
+        end,
-        [">=0.7.0"] = "0.7-compat",
+    },
-        ["<0.7.0"] = utils.nil_val, -- use pinned commits
+    {
-    }),
+        -- Quick toggling of Location and Quickfix lists
-    commit = utils.map_version_rule({
+        "milkypostman/vim-togglelist",
-        [">=0.8.0"] = utils.nil_val,
+        config = function()
-        [">=0.7.0"] = utils.nil_val, -- Use pinned branch
+            vim.api.nvim_set_keymap("n", "<F6>", ":call ToggleQuickfixList()<CR>", { silent = true, noremap = true })
-        [">=0.6.0"] = "4b403d2d724f48150ded41189ae4866492a8158b",
+            vim.api.nvim_set_keymap("n", "<F7>", ":call ToggleLocationList()<CR>", { silent = true, noremap = true })
-        [">=0.5.1"] = "739a98c12bedaa2430c4a3c08d1d22ad6c16513e",
+        end,
-        [">=0.5.0"] = "3e7390735501d0507bf2c2b5c2e7a16f58deeb81",
+    },
-    }),
+    {
-    requires = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
+        -- Find text everywhere!
-})
+        "mhinz/vim-grepper",
-
+        config = function()
--- Writing
+            require("plugins.grepper")
--- abolish/pencil
+        end,
-use({
+    },
-    "preservim/vim-pencil",
+    {
-    cmd = { "Pencil" },
+        -- Highlight inline colors
-})
+        "norcalli/nvim-colorizer.lua",
-use({
+        config = function()
-    "preservim/vim-textobj-sentence",
+            require("colorizer").setup()
-    requires = "kana/vim-textobj-user",
+        end,
-})
+    },
-use({
+    -- Status line
-    "junegunn/goyo.vim",
+    {
-    cmd = { "Goyo", "Zen" },
+        -- Custom status line
-    config = [[require("plugins.goyo-limelight")]],
+        "SmiteshP/nvim-gps",
-    requires = { "junegunn/limelight.vim", cmd = "Limelight" },
+        dependencies = { "nvim-treesitter/nvim-treesitter" },
-})
+        enabled = vim.fn.has("nvim-0.7.0") ~= 1,
-
+        lazy = true,
--- Treesitter
+    },
-use({
+    {
-    "nvim-treesitter/nvim-treesitter",
+        -- Replaces gps for 0.7+
-    run = ":TSUpdate",
+        "SmiteshP/nvim-navic",
-    commit = utils.map_version_rule({
+        dependencies = { "neovim/nvim-lspconfig" },
-        [">=0.8.0"] = utils.nil_val,
+        enabled = vim.fn.has("nvim-0.7.0") == 1,
-        [">=0.7.0"] = "4cccb6f494eb255b32a290d37c35ca12584c74d0",
+        lazy = true,
-        [">=0.5.0"] = "a189323454d1215c682c7ad7db3e6739d26339c4",
+    },
-    }),
+    {
-    config = function()
+        "nvim-lualine/lualine.nvim",
-        require("utils").require_with_local("plugins.treesitter").setup()
+        config = function()
-    end,
+            require("plugins.lualine").config_lualine()
-})
+        end,
-use({
+    },
-    "nvim-treesitter/nvim-treesitter-refactor",
+    {
-    requires = "nvim-treesitter/nvim-treesitter",
+        "cormacrelf/dark-notify",
-})
+        enabled = vim.g.is_mac,
-use({
+        -- Download latest release on install
-    "nvim-treesitter/nvim-treesitter-textobjects",
+        build = "curl -s https://api.github.com/repos/cormacrelf/dark-notify/releases/latest | jq '.assets[].browser_download_url' | xargs curl -Ls | tar xz -C ~/.local/bin/", -- luacheck: no max line length
-    requires = "nvim-treesitter/nvim-treesitter",
+        config = config_dark_notify,
-})
+        dependencies = {
-
+            "nvim-lualine/lualine.nvim",
--- Completion
-use({
-    "hrsh7th/nvim-cmp",
-    config = function()
-        require("plugins.completion").config_cmp()
-    end,
-    commit = utils.map_version_rule({
-        [">=0.7.0"] = utils.nil_val,
-        [">=0.5.0"] = "bba6fb67fdafc0af7c5454058dfbabc2182741f4",
-    }),
-    requires = {
-        { "hrsh7th/cmp-nvim-lsp", after = "nvim-cmp" },
-        { "hrsh7th/cmp-buffer", after = "nvim-cmp" },
-        { "f3fora/cmp-spell", after = "nvim-cmp" },
-        {
-            "saadparwaiz1/cmp_luasnip",
-            after = "nvim-cmp",
-            commit = utils.map_version_rule({
-                [">0.7.0"] = utils.nil_val,
-                [">=0.5.0"] = "b10829736542e7cc9291e60bab134df1273165c9",
-            }),
         },
-        "L3MON4D3/LuaSnip",
     },
-    event = "InsertEnter *",
+    -- LSP
-})
+    {
-
+        -- Configure language servers
--- Add snippets
+        "neovim/nvim-lspconfig",
-use({
+        tag = utils.map_version_rule({
-    "rafamadriz/friendly-snippets",
+            -- [">=0.8.0"] = utils.nil_val,
-    requires = "L3MON4D3/LuaSnip",
+            [">=0.7.0"] = "v0.1.6",
-    after = "LuaSnip",
+            [">=0.6.1"] = "v0.1.2",
-    config = function()
+            [">=0.6.0"] = "v0.1.0",
-        require("luasnip.loaders.from_vscode").load()
+        }),
-    end,
+    },
-})
+    {
-
+        -- Install language servers
-use({
+        "williamboman/mason.nvim",
-    "ray-x/lsp_signature.nvim",
+        dependencies = {
-    config = function()
+            "neovim/nvim-lspconfig",
-        require("lsp_signature").setup({
+            "williamboman/mason-lspconfig.nvim",
-            extra_trigger_chars = { "(", "," },
+        },
-            auto_close_after = nil,
+        -- Only supports >=0.7.0
-            -- Toggle these to use hint only
+        enabled = vim.fn.has("nvim-0.7.0") == 1,
-            floating_window = true,
+    },
-            hint_enable = false,
+    {
-        })
+        -- Lua dev for vim
-    end,
+        "folke/neodev.nvim",
-})
+        dependencies = { "neovim/nvim-lspconfig" },
-
+    },
--- Fuzzy Finder
+    -- Better display of lsp diagnostics
-use({
+    "folke/trouble.nvim",
-    "nvim-telescope/telescope.nvim",
+    {
-    requires = {
+        -- Incremental lsp rename view
-        "nvim-lua/plenary.nvim",
+        "smjonas/inc-rename.nvim",
-        "nvim-lua/popup.nvim",
+        --[[
-        "nvim-telescope/telescope-file-browser.nvim",
+        config = function()
+            require("inc_rename").setup()
+        end,
+        --]]
+        -- Only supports >=0.8.0
+        enabled = vim.fn.has("nvim-0.8.0") == 1,
+    },
+    {
+        -- Generic linter/formatters in diagnostics API
+        "jose-elias-alvarez/null-ls.nvim",
+        branch = utils.map_version_rule({
+            [">=0.8.0"] = utils.nil_val,
+            [">=0.7.0"] = "0.7-compat",
+            ["<0.7.0"] = utils.nil_val, -- use pinned commits
+        }),
+        commit = utils.map_version_rule({
+            [">=0.8.0"] = utils.nil_val,
+            [">=0.7.0"] = utils.nil_val, -- Use pinned branch
+            [">=0.6.0"] = "4b403d2d724f48150ded41189ae4866492a8158b",
+            [">=0.5.1"] = "739a98c12bedaa2430c4a3c08d1d22ad6c16513e",
+            [">=0.5.0"] = "3e7390735501d0507bf2c2b5c2e7a16f58deeb81",
+        }),
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+            "neovim/nvim-lspconfig",
+        },
+    },
+    -- Writing
+    {
+        -- abolish/pencil
+        "preservim/vim-pencil",
+        cmd = { "Pencil" },
+    },
+    {
+        "preservim/vim-textobj-sentence",
+        dependencies = { "kana/vim-textobj-user" },
+    },
+    {
+        "junegunn/goyo.vim",
+        cmd = { "Goyo", "Zen" },
+        config = function()
+            require("plugins.goyo-limelight")
+        end,
+        dependencies = { "junegunn/limelight.vim", cmd = "Limelight" },
     },
-    tag = utils.map_version_rule({
-        -- Follow stable release tag
-        [">=0.7.0"] = "0.1.0",
-        [">=0.6.0"] = "nvim-0.6",
-        ["<0.6.0"] = "nvim-0.5.1",
-        ["==0.5.0"] = "nvim-0.5.0",
-    }),
-    config = function()
-        require("plugins.telescope")
-    end,
-})
 
--- Filetypes
+    -- Treesitter
-use("ViViDboarder/vim-forcedotcom")
+    {
-use("rust-lang/rust.vim")
+        "nvim-treesitter/nvim-treesitter",
-use("hsanson/vim-android")
+        build = ":TSUpdate",
-use({
+        commit = utils.map_version_rule({
-    "sheerun/vim-polyglot",
+            [">=0.8.0"] = utils.nil_val,
-    config = function()
+            [">=0.7.0"] = "4cccb6f494eb255b32a290d37c35ca12584c74d0",
-        vim.cmd([[
+            [">=0.5.0"] = "a189323454d1215c682c7ad7db3e6739d26339c4",
-        augroup polyglot_fts
+        }),
+        config = function()
+            require("utils").require_with_local("plugins.treesitter").setup()
+        end,
+    },
+    {
+        "nvim-treesitter/nvim-treesitter-refactor",
+        dependencies = { "nvim-treesitter/nvim-treesitter" },
+    },
+    {
+        "nvim-treesitter/nvim-treesitter-textobjects",
+        dependencies = { "nvim-treesitter/nvim-treesitter" },
+    },
+
+    {
+        -- Completion
+        "hrsh7th/nvim-cmp",
+        config = function()
+            require("plugins.completion").config_cmp()
+        end,
+        commit = utils.map_version_rule({
+            [">=0.7.0"] = utils.nil_val,
+            [">=0.5.0"] = "bba6fb67fdafc0af7c5454058dfbabc2182741f4",
+        }),
+        dependencies = {
+            "hrsh7th/cmp-nvim-lsp",
+            "hrsh7th/cmp-buffer",
+            "f3fora/cmp-spell",
+            {
+                "saadparwaiz1/cmp_luasnip",
+                dependencies = {
+                    "L3MON4D3/LuaSnip",
+                },
+            },
+        },
+        event = "InsertEnter *",
+    },
+    -- Add snippets
+    {
+        "rafamadriz/friendly-snippets",
+        dependencies = { "L3MON4D3/LuaSnip" },
+        -- after = "LuaSnip",
+        config = function()
+            require("luasnip.loaders.from_vscode").load()
+        end,
+    },
+    {
+        "ray-x/lsp_signature.nvim",
+        config = function()
+            require("lsp_signature").setup({
+                extra_trigger_chars = { "(", "," },
+                auto_close_after = nil,
+                -- Toggle these to use hint only
+                floating_window = true,
+                hint_enable = false,
+            })
+        end,
+    },
+    {
+        -- Fuzzy Finder
+        "nvim-telescope/telescope.nvim",
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+            "nvim-lua/popup.nvim",
+            "nvim-telescope/telescope-file-browser.nvim",
+        },
+        tag = utils.map_version_rule({
+            -- Follow stable release tag
+            [">=0.7.0"] = "0.1.0",
+            [">=0.6.0"] = "nvim-0.6",
+            ["<0.6.0"] = "nvim-0.5.1",
+            ["==0.5.0"] = "nvim-0.5.0",
+        }),
+        config = function()
+            require("plugins.telescope")
+        end,
+    },
+    -- Filetypes
+    "ViViDboarder/vim-forcedotcom",
+    "rust-lang/rust.vim",
+    "hsanson/vim-android",
+    {
+        "sheerun/vim-polyglot",
+        config = function()
+            vim.cmd([[
+            augroup polyglot_fts
             au BufRead,BufNewFile */playbooks/*.yml,*/playbooks/*.yaml set filetype=yaml.ansible
             au BufRead,BufNewFile go.mod,go.sum set filetype=gomod
-        augroup end
+            augroup end
-        ]])
+            ]])
-    end,
+        end,
-})
-
--- Debuging nvim config
-use({
-    "tweekmonster/startuptime.vim",
-    cmd = { "StartupTime" },
-})
-
--- Fancy todo highlighting
-use({
-    "folke/todo-comments.nvim",
-    requires = {
-        "nvim-lua/plenary.nvim",
     },
-    config = function()
+    {
-        require("plugins.todo")
+        -- Debuging nvim config
-    end,
+        "tweekmonster/startuptime.vim",
+        cmd = { "StartupTime" },
+    },
+    {
+        -- Fancy todo highlighting
+        "folke/todo-comments.nvim",
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+        },
+        config = function()
+            require("plugins.todo")
+        end,
+    },
+    {
+        -- Fancy notifications
+        "rcarriga/nvim-notify",
+        config = function()
+            require("plugins.notify")
+        end,
+    },
+}, {
+    -- Use version specific lockfiles
+    lockfile = vim.fn.stdpath("config") .. "/lazy-lock-" .. utils.map_version_rule({
+        [">=0.9.0"] = "0.9",
+        [">=0.8.0"] = "0.8",
+    }) .. ".json",
 })
-
--- Fancy notifications
-use({
-    "rcarriga/nvim-notify",
-    config = function()
-        require("plugins.notify")
-    end,
-})
-
--- Auto sync after bootstrapping on a fresh box
-if packer_bootstrap ~= "" then
-    packer.sync()
-end