fix(core): Address issues in transition from packer to lazy.nvim (#421)

Co-authored-by: Benjamin Valpey <bavalpey@users.noreply.github.com>

Author: bavalpey

lua/doom/core/functions.lua

@@ -257,28 +257,28 @@ end
 functions.nuke = function(target)
   if target == nil or #target == 0 then
     vim.notify(
-      "Warning, this command deletes packer caches and causes a re-install of doom-nvim on next launch.\n\n :DoomNuke plugins|cache|mason|all. \n\t `cache` - Clear packer_compiled.lua\n\t `plugins` - Clear all installed plugins\n\t `mason` - Clear all Mason.nvim packages\n\t `all` - Delete all of the above."
+      "Warning, this command deletes lazy caches and causes a re-install of doom-nvim on next launch.\n\n :DoomNuke plugins|cache|mason|all. \n\t `cache` - Clear lazy.lua\n\t `plugins` - Clear all installed plugins\n\t `mason` - Clear all Mason.nvim packages\n\t `all` - Delete all of the above."
     )
     return
   end
 
   local log = require("doom.utils.logging")
-  -- Delete packer compiled
+  -- Delete lazy compiled
   if target == "all" or target == "cache" then
     os.remove(system.doom_compile_path)
-    log.info("DoomNuke: Deleting packer compiled.")
+    log.info("DoomNuke: Deleting lazy compiled.")
   end
 
   if target == "all" or target == "plugins" then
     -- Delete all plugins
-    local util = require("packer.util")
+    local util = require("lazy.util")
     local plugin_dir = util.join_paths(vim.fn.stdpath("data"), "site", "pack")
     fs.rm_dir(plugin_dir)
-    log.info("DoomNuke: Deleting packer plugins.  Doom-nvim will re-install on next launch.")
+    log.info("DoomNuke: Deleting lazy plugins.  Doom-nvim will re-install on next launch.")
   end
 
   if target == "all" or target == "mason" then
-    local util = require("packer.util")
+    local util = require("lazy.util")
     local mason_dir = util.join_paths(vim.fn.stdpath("data"), "mason")
     fs.rm_dir(mason_dir)
     log.info("DoomNuke: Deleting mason packages")

lua/doom/core/modules.lua

@@ -89,7 +89,7 @@ modules.load_modules = function()
             end
 
             -- Only pin dependencies if doom.freeze_dependencies is true
-            spec.lock = spec.commit and doom.freeze_dependencies
+            spec.pin = spec.commit and doom.freeze_dependencies
 
             -- Save module spec to be initialised later
             table.insert(doom.packages, spec)

lua/doom/modules/core/doom/init.lua

@@ -142,12 +142,11 @@ required.binds = function()
           { "r", "<cmd>DoomRollback<CR>", name = "Rollback" },
           { "R", "<cmd>DoomReport<CR>", name = "Report issue" },
           { "u", "<cmd>DoomUpdate<CR>", name = "Update" },
-          { "s", "<cmd>PackerSync<CR>", name = "Sync packages" },
-          { "I", "<cmd>PackerInstall<CR>", name = "Install packages" },
-          { "C", "<cmd>PackerClean<CR>", name = "Clean packages" },
-          { "b", "<cmd>PackerCompile<CR>", name = "Build packages" },
-          { "S", "<cmd>PackerStatus<CR>", name = "Inform packages" },
-          { "p", "<cmd>PackerProfile<CR>", name = "Profile" },
+          { "s", "<cmd>Lazy sync<CR>", name = "Sync packages" },
+          { "I", "<cmd>Lazy install<CR>", name = "Install packages" },
+          { "C", "<cmd>Lazy clean<CR>", name = "Clean packages" },
+          -- { "b", "<cmd>Lazy build<CR>", name = "Build packages" },
+          { "p", "<cmd>Lazy profile<CR>", name = "Profile" },
         },
       },
       {

lua/doom/modules/core/reloader/init.lua

@@ -125,12 +125,12 @@ reloader._reload_doom = function()
   if needs_install then
     if not _G._doom_reloader._has_shown_packer_compile_message then
       log.warn(
-        "reloader: You will have to run `:PackerCompile` before changes to plugin configs take effect."
+        "reloader: You will have to run `:Lazy build` before changes to plugin configs take effect."
       )
       _G._doom_reloader._has_shown_packer_compile_message = true
     end
   else
-    log.warn("reloader: Run `:PackerSync` to install and configure new plugins.")
+    log.warn("reloader: Run `:Lazy sync` to install and configure new plugins.")
   end
 
   vim.cmd("doautocmd VimEnter")
@@ -156,7 +156,7 @@ reloader.reload = function()
 end
 
 reloader.settings = {
-  reload_on_save = true,
+  reload_on_save = false,
 }
 reloader.packages = {}
 reloader.configs = {}

lua/doom/modules/core/treesitter/init.lua

@@ -56,13 +56,19 @@ treesitter.packages = {
   ["nvim-ts-context-commentstring"] = {
     "JoosepAlviste/nvim-ts-context-commentstring",
     commit = "4a42b30376c1bd625ab5016c2079631d531d797a",
-    after = "nvim-treesitter",
+    -- after = "nvim-treesitter",
+    dependencies = {
+      "nvim-treesitter/nvim-treesitter"
+    },
     event = "VeryLazy",
   },
   ["nvim-ts-autotag"] = {
     "windwp/nvim-ts-autotag",
     commit = "fdefe46c6807441460f11f11a167a2baf8e4534b",
-    after = "nvim-treesitter",
+    -- after = "nvim-treesitter",
+    dependencies = {
+      "nvim-treesitter/nvim-treesitter"
+    },
     event = "VeryLazy",
   },
 }

lua/doom/modules/features/annotations/init.lua

@@ -22,7 +22,9 @@ annotations.packages = {
     commit = "0958aeffcddf46e57785c3026be934816b4f39d2",
     keys = { "<leader>cg" },
     cmd = "Neogen",
-    after = "nvim-treesitter",
+    dependencies={
+      "nvim-treesitter/nvim-treesitter"
+    }
   },
 }
 

lua/doom/modules/features/dap/init.lua

@@ -15,7 +15,8 @@ dap.settings = {
       edit = "e",
       repl = "r",
     },
-    sidebar = {
+    layouts = {
+      {
       elements = {
         "scopes",
         "breakpoints",
@@ -24,13 +25,15 @@ dap.settings = {
       },
       size = 40,
       position = "left",
-    },
-    tray = {
-      elements = {
-        "repl",
       },
+      {
+        elements = {
+          "repl",
+          "console",
+        },
       size = 10,
       position = "bottom",
+      }
     },
   },
 }
@@ -43,7 +46,10 @@ dap.packages = {
   ["nvim-dap-ui"] = {
     "rcarriga/nvim-dap-ui",
     commit = "b80227ea56a48177786904f6322abc8b2dc0bc36",
-    after = { "nvim-dap" },
+    dependencies = {
+      "mfussenegger/nvim-dap",
+    }
+    -- after = { "nvim-dap" },
   },
 }
 

lua/doom/modules/features/linter/init.lua

@@ -14,7 +14,8 @@ linter.packages = {
   ["null-ls.nvim"] = {
     "jose-elias-alvarez/null-ls.nvim",
     commit = "915558963709ea17c5aa246ca1c9786bfee6ddb4",
-    after = "nvim-lspconfig",
+    dependencies={"neovim/nvim-lspconfig"},
+    -- after = "nvim-lspconfig",
   },
 }
 

lua/doom/modules/features/lsp/init.lua

@@ -114,32 +114,48 @@ lsp.packages = {
   ["cmp-nvim-lua"] = {
     "hrsh7th/cmp-nvim-lua",
     commit = "f3491638d123cfd2c8048aefaf66d246ff250ca6",
-    after = "nvim-cmp",
+    -- after = "nvim-cmp",
+    dependencies = {
+      "hrsh7th/nvim-cmp",
+    }
   },
   ["cmp-nvim-lsp"] = {
     "hrsh7th/cmp-nvim-lsp",
-    commit = "59224771f91b86d1de12570b4070fe4ad7cd1eeb",
-    after = "nvim-cmp",
+    -- after = "nvim-cmp",
+    dependencies = {
+      "hrsh7th/nvim-cmp",
+    }
   },
   ["cmp-path"] = {
     "hrsh7th/cmp-path",
-    commit = "91ff86cd9c29299a64f968ebb45846c485725f23",
-    after = "nvim-cmp",
+    -- after = "nvim-cmp",
+    dependencies = {
+      "hrsh7th/nvim-cmp",
+    }
   },
   ["cmp-buffer"] = {
     "hrsh7th/cmp-buffer",
     commit = "3022dbc9166796b644a841a02de8dd1cc1d311fa",
-    after = "nvim-cmp",
+    -- after = "nvim-cmp",
+    dependencies = {
+      "hrsh7th/nvim-cmp",
+    }
   },
   ["cmp_luasnip"] = {
     "saadparwaiz1/cmp_luasnip",
     commit = "18095520391186d634a0045dacaa346291096566",
-    after = "nvim-cmp",
+    -- after = "nvim-cmp",
+    dependencies = {
+      "hrsh7th/nvim-cmp",
+    }
   },
   ["lsp_signature.nvim"] = {
     "ray-x/lsp_signature.nvim",
     commit = "1979f1118e2b38084e7c148f279eed6e9300a342",
-    after = "nvim-lspconfig",
+    -- after = "nvim-lspconfig",
+    dependencies = {
+      "neovim/nvim-lspconfig",
+    },
     event = "VeryLazy",
   },
 }

lua/doom/modules/features/lsp_progress/init.lua

@@ -6,7 +6,8 @@ fidget.packages = {
   ["fidget.nvim"] = {
     "j-hui/fidget.nvim",
     commit = "44585a0c0085765195e6961c15529ba6c5a2a13b",
-    after = "nvim-lspconfig",
+    dependencies = {"neovim/nvim-lspconfig"},
+    -- after = "nvim-lspconfig",
     event = "VeryLazy",
   },
 }