summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Huggins <[email protected]>2022-10-21 01:21:22 -0400
committerGitHub <[email protected]>2022-10-21 01:21:22 -0400
commit36c8bdee9ff59a0a63c1edfc445b5eb2886cf246 (patch)
tree93bcea9656ca5534e20c36bb52e83fe557799a83
parent30c65cfd74756954779f3ea9d232938e642bc07f (diff)
refactor(plugins)!: remove nvim-notify from core (#3300)
-rw-r--r--lua/lvim/config/init.lua12
-rw-r--r--lua/lvim/core/builtins/init.lua1
-rw-r--r--lua/lvim/core/notify.lua72
-rw-r--r--lua/lvim/core/nvimtree.lua17
-rw-r--r--lua/lvim/core/telescope.lua6
-rw-r--r--lua/lvim/plugins.lua8
-rw-r--r--snapshots/default.json3
-rw-r--r--utils/installer/config.example.lua1
-rw-r--r--utils/installer/config_win.example.lua1
9 files changed, 12 insertions, 109 deletions
diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua
index 59722673..ae5dd601 100644
--- a/lua/lvim/config/init.lua
+++ b/lua/lvim/config/init.lua
@@ -46,6 +46,11 @@ function M:init()
friendly_snippets = true,
},
}
+
+ ---@deprecated
+ lvim.builtin.notify = {
+ active = false
+ }
end
local function handle_deprecated_settings()
@@ -93,6 +98,13 @@ local function handle_deprecated_settings()
deprecation_notice("lvim.builtin.dashboard", "Use `lvim.builtin.alpha` instead. See LunarVim#1906")
end
+
+ -- notify.nvim
+ if lvim.builtin.notify.active then
+ deprecation_notice("lvim.builtin.notify", "See LunarVim#3294")
+ end
+
+
if lvim.autocommands.custom_groups then
deprecation_notice(
"lvim.autocommands.custom_groups",
diff --git a/lua/lvim/core/builtins/init.lua b/lua/lvim/core/builtins/init.lua
index 0060c460..4764ff70 100644
--- a/lua/lvim/core/builtins/init.lua
+++ b/lua/lvim/core/builtins/init.lua
@@ -18,7 +18,6 @@ local builtins = {
"lvim.core.bufferline",
"lvim.core.autopairs",
"lvim.core.comment",
- "lvim.core.notify",
"lvim.core.lualine",
"lvim.core.alpha",
"lvim.core.mason",
diff --git a/lua/lvim/core/notify.lua b/lua/lvim/core/notify.lua
deleted file mode 100644
index b08c45a6..00000000
--- a/lua/lvim/core/notify.lua
+++ /dev/null
@@ -1,72 +0,0 @@
-local M = {}
-
-local Log = require "lvim.core.log"
-
-local defaults = {
- active = true,
- on_config_done = nil,
- opts = {
- ---@usage Animation style one of { "fade", "slide", "fade_in_slide_out", "static" }
- stages = "slide",
-
- ---@usage Function called when a new window is opened, use for changing win settings/config
- on_open = nil,
-
- ---@usage Function called when a window is closed
- on_close = nil,
-
- ---@usage timeout for notifications in ms, default 5000
- timeout = 5000,
-
- -- Render function for notifications. See notify-render()
- render = "default",
-
- ---@usage highlight behind the window for stages that change opacity
- background_colour = "Normal",
-
- ---@usage minimum width for notification windows
- minimum_width = 50,
-
- ---@usage Icons for the different levels
- icons = {
- ERROR = lvim.icons.diagnostics.Error,
- WARN = lvim.icons.diagnostics.Warning,
- INFO = lvim.icons.diagnostics.Information,
- DEBUG = lvim.icons.diagnostics.Debug,
- TRACE = lvim.icons.diagnostics.Trace,
- },
- },
-}
-
-function M.config()
- if not lvim.use_icons then
- defaults.opts.icons = {
- ERROR = "[ERROR]",
- WARN = "[WARNING]",
- INFO = "[INFO]",
- DEBUG = "[DEBUG]",
- TRACE = "[TRACE]",
- }
- end
- lvim.builtin.notify = vim.tbl_deep_extend("force", defaults, lvim.builtin.notify or {})
-end
-
-function M.setup()
- if #vim.api.nvim_list_uis() == 0 then
- -- no need to configure notifications in headless
- return
- end
-
- local opts = lvim.builtin.notify and lvim.builtin.notify.opts or defaults
-
- local status_ok, notify = pcall(require, "notify")
- if not status_ok then
- return
- end
-
- notify.setup(opts)
- vim.notify = notify
- Log:configure_notifications(notify)
-end
-
-return M
diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua
index 199279a6..d98816f5 100644
--- a/lua/lvim/core/nvimtree.lua
+++ b/lua/lvim/core/nvimtree.lua
@@ -147,23 +147,6 @@ function M.setup()
return
end
- local status_ok_1, utils = pcall(require, "nvim-tree.utils")
- if not status_ok_1 then
- return
- end
-
- local function notify_level()
- return function(msg)
- vim.schedule(function()
- vim.api.nvim_echo({ { msg, "WarningMsg" } }, false, {})
- end)
- end
- end
-
- utils.notify.warn = notify_level(vim.log.levels.WARN)
- utils.notify.error = notify_level(vim.log.levels.ERROR)
- utils.notify.info = notify_level(vim.log.levels.INFO)
- utils.notify.debug = notify_level(vim.log.levels.DEBUG)
if lvim.builtin.nvimtree._setup_called then
Log:debug "ignoring repeated setup call for nvim-tree, see kyazdani42/nvim-tree.lua#1308"
diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua
index 77bf552d..0cfe0b23 100644
--- a/lua/lvim/core/telescope.lua
+++ b/lua/lvim/core/telescope.lua
@@ -164,12 +164,6 @@ function M.setup()
end)
end
- if lvim.builtin.notify.active then
- pcall(function()
- require("telescope").load_extension "notify"
- end)
- end
-
if lvim.builtin.telescope.on_config_done then
lvim.builtin.telescope.on_config_done(telescope)
end
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index db84d878..49b6fc23 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -17,14 +17,6 @@ local core_plugins = {
{
"folke/tokyonight.nvim",
},
- {
- "rcarriga/nvim-notify",
- config = function()
- require("lvim.core.notify").setup()
- end,
- requires = { "nvim-telescope/telescope.nvim" },
- disable = not lvim.builtin.notify.active or not lvim.builtin.telescope.active,
- },
{ "Tastyep/structlog.nvim" },
{ "nvim-lua/popup.nvim" },
diff --git a/snapshots/default.json b/snapshots/default.json
index f0a6d293..8c41358c 100644
--- a/snapshots/default.json
+++ b/snapshots/default.json
@@ -71,9 +71,6 @@
"nvim-navic": {
"commit": "132b273"
},
- "nvim-notify": {
- "commit": "af935fd"
- },
"nvim-tree.lua": {
"commit": "c446527"
},
diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua
index ee599d1b..68b19d5c 100644
--- a/utils/installer/config.example.lua
+++ b/utils/installer/config.example.lua
@@ -64,7 +64,6 @@ lvim.keys.normal_mode["<C-s>"] = ":w<cr>"
-- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile
lvim.builtin.alpha.active = true
lvim.builtin.alpha.mode = "dashboard"
-lvim.builtin.notify.active = true
lvim.builtin.terminal.active = true
lvim.builtin.nvimtree.setup.view.side = "left"
lvim.builtin.nvimtree.setup.renderer.icons.show.git = false
diff --git a/utils/installer/config_win.example.lua b/utils/installer/config_win.example.lua
index 40cc34e8..ecdff296 100644
--- a/utils/installer/config_win.example.lua
+++ b/utils/installer/config_win.example.lua
@@ -80,7 +80,6 @@ lvim.keys.normal_mode["<C-s>"] = ":w<cr>"
-- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile
lvim.builtin.alpha.active = true
lvim.builtin.alpha.mode = "dashboard"
-lvim.builtin.notify.active = true
lvim.builtin.terminal.active = false
-- lvim.builtin.terminal.shell = "pwsh.exe -NoLogo"