6 files changed, 20 insertions, 19 deletions
diff --git a/lua/lvim/core/breadcrumbs.lua b/lua/lvim/core/breadcrumbs.lua
index d6db55a5..149b5fcf 100644
--- a/lua/lvim/core/breadcrumbs.lua
+++ b/lua/lvim/core/breadcrumbs.lua
@@ -6,7 +6,7 @@ local icons = lvim.icons.kind
 
 M.config = function()
   lvim.builtin.breadcrumbs = {
-    active = false,
+    active = true,
     on_config_done = nil,
     options = {
       icons = {
diff --git a/lua/lvim/core/dap.lua b/lua/lvim/core/dap.lua
index 4045390b..cff50f64 100644
--- a/lua/lvim/core/dap.lua
+++ b/lua/lvim/core/dap.lua
@@ -2,7 +2,7 @@ local M = {}
 
 M.config = function()
   lvim.builtin.dap = {
-    active = false,
+    active = true,
     on_config_done = nil,
     breakpoint = {
       text = lvim.icons.ui.Bug,
@@ -29,7 +29,10 @@ M.config = function()
 end
 
 M.setup = function()
-  local dap = require "dap"
+  local status_ok, dap = pcall(require, "dap")
+  if not status_ok then
+    return
+  end
 
   if lvim.use_icons then
     vim.fn.sign_define("DapBreakpoint", lvim.builtin.dap.breakpoint)
@@ -61,7 +64,10 @@ M.setup = function()
 end
 
 M.setup_ui = function()
-  local dap = require "dap"
+  local status_ok, dap = pcall(require, "dap")
+  if not status_ok then
+    return
+  end
   local dapui = require "dapui"
   dapui.setup {
     expand_lines = true,
diff --git a/lua/lvim/core/notify.lua b/lua/lvim/core/notify.lua
index 272fdced..b08c45a6 100644
--- a/lua/lvim/core/notify.lua
+++ b/lua/lvim/core/notify.lua
@@ -3,7 +3,7 @@ local M = {}
 local Log = require "lvim.core.log"
 
 local defaults = {
-  active = false,
+  active = true,
   on_config_done = nil,
   opts = {
     ---@usage Animation style one of { "fade", "slide", "fade_in_slide_out", "static" }
@@ -58,7 +58,11 @@ function M.setup()
   end
 
   local opts = lvim.builtin.notify and lvim.builtin.notify.opts or defaults
-  local notify = require "notify"
+
+  local status_ok, notify = pcall(require, "notify")
+  if not status_ok then
+    return
+  end
 
   notify.setup(opts)
   vim.notify = notify
diff --git a/lua/lvim/core/terminal.lua b/lua/lvim/core/terminal.lua
index 65cba56d..006452e1 100644
--- a/lua/lvim/core/terminal.lua
+++ b/lua/lvim/core/terminal.lua
@@ -3,7 +3,7 @@ local Log = require "lvim.core.log"
 
 M.config = function()
   lvim.builtin["terminal"] = {
-    active = false,
+    active = true,
     on_config_done = nil,
     -- size can be a number or function which is passed the current terminal
     size = 20,
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index 0b5e1c72..a0f5d14d 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -223,15 +223,6 @@ local core_plugins = {
     disable = not lvim.builtin.dap.active,
   },
 
-  -- Debugger management
-  {
-    "Pocco81/dap-buddy.nvim",
-    branch = "dev",
-    -- event = "BufWinEnter",
-    -- event = "BufRead",
-    disable = not lvim.builtin.dap.active,
-  },
-
   -- Debugger user interface
   {
     "rcarriga/nvim-dap-ui",
diff --git a/snapshots/default.json b/snapshots/default.json
index 4047d3a1..78fe9a1f 100644
--- a/snapshots/default.json
+++ b/snapshots/default.json
@@ -23,9 +23,6 @@
   "cmp_luasnip": {
     "commit": "a9de941"
   },
-  "dap-buddy.nvim": {
-    "commit": "3679132"
-  },
   "friendly-snippets": {
     "commit": "2be79d8"
   },
@@ -65,6 +62,9 @@
   "nvim-dap": {
     "commit": "0b320f5"
   },
+  "nvim-dap-ui": {
+    "commit": "c8ce83a"
+  },
   "nvim-lspconfig": {
     "commit": "f11fdff"
   },