diff --git a/modules/plugins/ui/noice/config.nix b/modules/plugins/ui/noice/config.nix index 1f81f4a9..e4721b66 100644 --- a/modules/plugins/ui/noice/config.nix +++ b/modules/plugins/ui/noice/config.nix @@ -6,8 +6,6 @@ }: let inherit (lib.modules) mkIf; inherit (lib.lists) optionals; - inherit (lib.nvim.lua) toLuaObject; - inherit (lib.nvim.dag) entryAnywhere; cfg = config.vim.ui.noice; tscfg = config.vim.treesitter; @@ -16,16 +14,15 @@ in { config = mkIf cfg.enable { vim = { - startPlugins = [ - "noice-nvim" - "nui-nvim" - ]; - + startPlugins = ["nui-nvim"]; treesitter.grammars = optionals tscfg.addDefaultGrammars defaultGrammars; - pluginRC.noice-nvim = entryAnywhere '' - require("noice").setup(${toLuaObject cfg.setupOpts}) - ''; + lazy.plugins.noice-nvim = { + package = "noice-nvim"; + setupModule = "noice"; + event = ["DeferredUIEnter"]; + inherit (cfg) setupOpts; + }; }; }; } diff --git a/modules/plugins/visuals/nvim-web-devicons/config.nix b/modules/plugins/visuals/nvim-web-devicons/config.nix index 8892f24d..8d1ad1d3 100644 --- a/modules/plugins/visuals/nvim-web-devicons/config.nix +++ b/modules/plugins/visuals/nvim-web-devicons/config.nix @@ -9,9 +9,7 @@ in { config = mkIf cfg.enable { vim = { - startPlugins = ["nvim-web-devicons"]; - - vim.lazy.plugins.icon-picker-nvim = { + lazy.plugins.icon-picker-nvim = { package = "nvim-web-devicons"; setupModule = "nvim-web-devicons"; event = ["DeferredUIEnter"];