diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index b427840c..2ff72acd 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -56,10 +56,6 @@
   treesitter grammars were changed to prefer `grammarPlugins` over
   `builtGrammars`.
 
-[NotAShelf](https://github.com/notashelf):
-
-- Lazyload noice.nvim and nvim-web-devicons on `DeferredUIEnter`
-
 [jfeo](https://github.com/jfeo):
 
 [ccc.nvim]: https://github.com/uga-rosa/ccc.nvim
diff --git a/flake.lock b/flake.lock
index 4ebfffc3..a7cdc255 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769996383,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "lastModified": 1768135262,
+        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1770419553,
-        "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
+        "lastModified": 1769981889,
+        "narHash": "sha256-ndI7AxL/6auelkLHngdUGVImBiHkG8w2N2fOTKZKn4k=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
+        "rev": "332fed8f43b77149c582f1782683d6aeee1f07cf",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771008912,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "lastModified": 1769461804,
+        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
         "type": "github"
       },
       "original": {
diff --git a/modules/plugins/ui/noice/config.nix b/modules/plugins/ui/noice/config.nix
index e4721b66..1f81f4a9 100644
--- a/modules/plugins/ui/noice/config.nix
+++ b/modules/plugins/ui/noice/config.nix
@@ -6,6 +6,8 @@
 }: 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;
@@ -14,15 +16,16 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["nui-nvim"];
+      startPlugins = [
+        "noice-nvim"
+        "nui-nvim"
+      ];
+
       treesitter.grammars = optionals tscfg.addDefaultGrammars defaultGrammars;
 
-      lazy.plugins.noice-nvim = {
-        package = "noice-nvim";
-        setupModule = "noice";
-        event = ["DeferredUIEnter"];
-        inherit (cfg) setupOpts;
-      };
+      pluginRC.noice-nvim = entryAnywhere ''
+        require("noice").setup(${toLuaObject cfg.setupOpts})
+      '';
     };
   };
 }
diff --git a/modules/plugins/visuals/nvim-web-devicons/config.nix b/modules/plugins/visuals/nvim-web-devicons/config.nix
index 98f54e34..9c8e9418 100644
--- a/modules/plugins/visuals/nvim-web-devicons/config.nix
+++ b/modules/plugins/visuals/nvim-web-devicons/config.nix
@@ -4,17 +4,18 @@
   ...
 }: let
   inherit (lib.modules) mkIf;
+  inherit (lib.nvim.lua) toLuaObject;
+  inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.visuals.nvim-web-devicons;
 in {
   config = mkIf cfg.enable {
     vim = {
-      lazy.plugins.nvim-web-devicons = {
-        package = "nvim-web-devicons";
-        setupModule = "nvim-web-devicons";
-        event = ["DeferredUIEnter"];
-        inherit (cfg) setupOpts;
-      };
+      startPlugins = ["nvim-web-devicons"];
+
+      pluginRC.nvim-web-devicons = entryAnywhere ''
+        require("nvim-web-devicons").setup(${toLuaObject cfg.setupOpts})
+      '';
     };
   };
 }
diff --git a/modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix b/modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix
index b54ddcd5..6ff22614 100644
--- a/modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix
+++ b/modules/plugins/visuals/nvim-web-devicons/nvim-web-devicons.nix
@@ -1,6 +1,6 @@
 {lib, ...}: let
   inherit (lib.modules) mkRenamedOptionModule;
-  inherit (lib.options) mkOption mkEnableOption;
+  inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.types) nullOr attrsOf attrs enum;
   inherit (lib.nvim.types) mkPluginSetupOption;
 in {
@@ -16,27 +16,27 @@ in {
       variant = mkOption {
         type = nullOr (enum ["light" "dark"]);
         default = null;
-        description = ''
-          Set the light or dark variant manually, instead of relying on `background`
-        '';
+        description = "Set the light or dark variant manually, instead of relying on `background`";
       };
 
       override = mkOption {
         type = attrsOf attrs;
         default = {};
-        example = {
-          zsh = {
-            name = "Zsh";
-            icon = "";
-            color = "#428850";
-            cterm_color = "65";
-          };
-        };
+        example = literalExpression ''
+          {
+            zsh = {
+              name = "Zsh";
+              icon = "";
+              color = "#428850";
+              cterm_color = "65";
+            };
+          }
+        '';
         description = ''
           Your personal icon overrides.
 
-          You can specify color or `cterm_color` instead of specifying both of
-          them. `DevIcon` will be appended to `name`
+          You can specify color or cterm_color instead of specifying
+          both of them. DevIcon will be appended to `name`
         '';
       };
     };
diff --git a/npins/sources.json b/npins/sources.json
index f07d0d70..d1e16e61 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -2129,9 +2129,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "746ffbb17975ebd6c40142362eee1b0249969c5c",
-      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/746ffbb17975ebd6c40142362eee1b0249969c5c.tar.gz",
-      "hash": "sha256-jXWBPcfLwSkWQ/eRbxVDWC7kFOODSsCRmzC3rHKQLhQ="
+      "revision": "b8221e42cf7287c4dcde81f232f58d7b947c210d",
+      "url": "https://github.com/nvim-tree/nvim-web-devicons/archive/b8221e42cf7287c4dcde81f232f58d7b947c210d.tar.gz",
+      "hash": "sha256-lVrakFrpIP9lp7sMfMb33KeMPIkcn1qBFVytJzKCfuE="
     },
     "obsidian-nvim": {
       "type": "GitRelease",