diff --git a/docs/manual/configuring/custom-plugins.md b/docs/manual/configuring/custom-plugins.md
index 79a691e2..c621e03c 100644
--- a/docs/manual/configuring/custom-plugins.md
+++ b/docs/manual/configuring/custom-plugins.md
@@ -15,7 +15,7 @@ plugin to the runtime, you need to add it to the [](#opt-vim.startPlugins) list
 in your configuration.
 
 Adding a plugin to `startPlugins` will not allow you to configure the plugin
-that you have added, but **nvf** provides multiple way of configuring any custom
+that you have added, but **nvf** provides multiple ways of configuring any custom
 plugins that you might have added to your configuration.
 
 ```{=include=} sections
diff --git a/modules/plugins/assistant/avante/avante-nvim.nix b/modules/plugins/assistant/avante/avante-nvim.nix
index e616d421..3e101865 100644
--- a/modules/plugins/assistant/avante/avante-nvim.nix
+++ b/modules/plugins/assistant/avante/avante-nvim.nix
@@ -44,7 +44,8 @@ in {
           default = "claude";
           description = ''
             Since auto-suggestions are a high-frequency operation and therefore expensive,
-            currently designating it as `copilot` provider is dangerous because: https://github.com/yetone/avante.nvim/issues/1048
+            currently designating it as `copilot` provider is dangerous because:
+            https://github.com/yetone/avante.nvim/issues/1048
             Of course, you can reduce the request frequency by increasing `suggestion.debounce`.
           '';
         };
@@ -124,7 +125,10 @@ in {
             mkEnableOption ""
             // {
               default = false;
-              description = "Whether to support pasting image from clipboard. This will be determined automatically based whether img-clip is available or not.";
+              description = ''
+                Whether to support pasting image from clipboard.
+                This will be determined automatically based whether img-clip is available or not.
+              '';
             };
 
           minimize_diff =
diff --git a/modules/plugins/assistant/avante/config.nix b/modules/plugins/assistant/avante/config.nix
index 1c975558..369ff24e 100644
--- a/modules/plugins/assistant/avante/config.nix
+++ b/modules/plugins/assistant/avante/config.nix
@@ -21,23 +21,12 @@ in {
           package = avante-nvim;
           setupModule = "avante";
           inherit (cfg) setupOpts;
-          after =
-            /*
-            lua
-            */
-            ''
-              vim.opt.laststatus = 3
-            '';
+          event = ["DeferredUIEnter"];
         };
       };
 
       treesitter.enable = true;
 
-      autocomplete.nvim-cmp = {
-        sources = {"avante.nvim" = "[avante]";};
-        sourcePlugins = ["avante-nvim"];
-      };
-
       languages.markdown.extensions.render-markdown-nvim.setupOpts.file_types = lib.mkAfter ["Avante"];
     };
   };
diff --git a/npins/sources.json b/npins/sources.json
index 0fe81d49..d7e15028 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -27,17 +27,20 @@
       "hash": "0c1jkhxamfn2md7m1r5b2wpxa26y90b98yzjwf68m3fymalvkn5h"
     },
     "avante-nvim": {
-      "type": "Git",
+      "type": "GitRelease",
       "repository": {
         "type": "GitHub",
         "owner": "yetone",
         "repo": "avante.nvim"
       },
-      "branch": "main",
+      "pre_releases": false,
+      "version_upper_bound": null,
+      "release_prefix": null,
       "submodules": false,
-      "revision": "eb1cd44731783024621beafe4e46204cbc9a4320",
-      "url": "https://github.com/yetone/avante.nvim/archive/eb1cd44731783024621beafe4e46204cbc9a4320.tar.gz",
-      "hash": "1hdb1b74mxq6j10fv0zh6fniwpijwbxjxc59k7xzkqj6q20lad07"
+      "version": "v0.0.23",
+      "revision": "868c13657442b799a5c161940602f99623a08197",
+      "url": "https://api.github.com/repos/yetone/avante.nvim/tarball/v0.0.23",
+      "hash": "11h0fch0whr2mh23940h3k7l6grnp5bqv2nyxywkg1zvj680vpji"
     },
     "base16": {
       "type": "Git",