diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 87561a9d..8c88cd56 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -463,6 +463,3 @@
   leverage the pattern introduced in commit [fc8206e7a61d ("flake: utilize
   nix-systems for overridable flake systems")](
   https://github.com/NotAShelf/nvf/commit/fc8206e7a61d7eb02006f9010e62ebdb3336d0d2).
-
-[soliprem](https://github.com/soliprem):
-- fix broken `neorg` grammars
diff --git a/flake/avante-nvim/default.nix b/flake/avante-nvim/default.nix
index 0d128bae..3991d16b 100644
--- a/flake/avante-nvim/default.nix
+++ b/flake/avante-nvim/default.nix
@@ -15,7 +15,8 @@
     pname = "avante-nvim-lib";
     inherit version src;
 
-    cargoHash = "sha256-8mBpzndz34RrmhJYezd4hLrJyhVL4S4IHK3plaue1k8=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-pmnMoNdaIR0i+4kwW3cf01vDQo39QakTCEG9AXA86ck=";
 
     nativeBuildInputs = [
       pkg-config
diff --git a/modules/neovim/init/diagnostics.nix b/modules/neovim/init/diagnostics.nix
index 27f46efc..8a8e7b38 100644
--- a/modules/neovim/init/diagnostics.nix
+++ b/modules/neovim/init/diagnostics.nix
@@ -88,7 +88,7 @@
 in {
   options.vim = {
     diagnostics = {
-      enable = mkEnableOption "diagnostics module for Neovim";
+      enable = mkEnableOption "diagostics module for Neovim";
       config = mkOption {
         type = diagnosticsSubmodule;
         default = {};
diff --git a/modules/plugins/notes/neorg/config.nix b/modules/plugins/notes/neorg/config.nix
index f8c18ea9..fab5079d 100644
--- a/modules/plugins/notes/neorg/config.nix
+++ b/modules/plugins/notes/neorg/config.nix
@@ -35,7 +35,7 @@ in {
 
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
-      vim.treesitter.grammars = [cfg.treesitter.norgPackage cfg.treesitter.norgMetaPackage];
+      vim.treesitter.grammars = [cfg.treesitter.norgPackage];
     })
   ]);
 }
diff --git a/modules/plugins/notes/neorg/neorg.nix b/modules/plugins/notes/neorg/neorg.nix
index 684519c9..6b5cf18e 100644
--- a/modules/plugins/notes/neorg/neorg.nix
+++ b/modules/plugins/notes/neorg/neorg.nix
@@ -4,9 +4,9 @@
   pkgs,
   ...
 }: let
-  inherit (lib.options) mkPackageOption mkEnableOption mkOption;
+  inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.types) submodule listOf str;
-  inherit (lib.nvim.types) mkPluginSetupOption;
+  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
 in {
   options.vim.notes.neorg = {
     enable = mkEnableOption ''
@@ -44,12 +44,7 @@ in {
 
     treesitter = {
       enable = mkEnableOption "Neorg treesitter" // {default = config.vim.languages.enableTreesitter;};
-      norgPackage = mkPackageOption pkgs ["norg-meta treesitter"] {
-        default = ["tree-sitter-grammars" "tree-sitter-norg"];
-      };
-      norgMetaPackage = mkPackageOption pkgs ["norg-meta treesitter"] {
-        default = ["tree-sitter-grammars" "tree-sitter-norg-meta"];
-      };
+      norgPackage = mkGrammarOption pkgs "norg";
     };
   };
 }
diff --git a/modules/plugins/snippets/luasnip/config.nix b/modules/plugins/snippets/luasnip/config.nix
index 48b1f40d..5f2abdf0 100644
--- a/modules/plugins/snippets/luasnip/config.nix
+++ b/modules/plugins/snippets/luasnip/config.nix
@@ -65,9 +65,6 @@ in {
         ${optionalString (
           cfg.customSnippets.snipmate != {}
         ) "require('luasnip.loaders.from_snipmate').lazy_load()"}
-        ${optionalString (
-          config.vim.autocomplete.nvim-cmp.enable || config.vim.autocomplete.blink-cmp.friendly-snippets.enable
-        ) "require('luasnip.loaders.from_vscode').lazy_load()"}
       '';
     };
   };
diff --git a/modules/plugins/theme/supported-themes.nix b/modules/plugins/theme/supported-themes.nix
index ad1f8a3d..1d1f2397 100644
--- a/modules/plugins/theme/supported-themes.nix
+++ b/modules/plugins/theme/supported-themes.nix
@@ -246,10 +246,10 @@ in {
         transparent = {
           enabled = ${boolToString transparent},
         },
-        ${optionalString (palette != null) ''palette = "${palette}",''}
-        ${optionalString (variant != null) ''variant = "${variant}",''}
+        ${optionalString (!isNull palette) ''palette = "${palette}",''}
+        ${optionalString (!isNull variant) ''variant = "${variant}",''}
       }
-      ${optionalString (background != null) ''vim.opt.background = "${background}"''}
+      ${optionalString (!isNull background) ''vim.opt.background = "${background}"''}
       vim.cmd.colorscheme "solarized"
     '';
     styles = let
diff --git a/modules/plugins/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix
index 80a30a5a..d88cc1a9 100644
--- a/modules/plugins/treesitter/treesitter.nix
+++ b/modules/plugins/treesitter/treesitter.nix
@@ -106,7 +106,7 @@ in {
           -- Disable slow treesitter highlight for large files
           function(lang, buf)
             local max_filesize = 1000 * 1024 -- 1MB
-            local ok, stats = pcall(vim.uv.fs_stat, vim.api.nvim_buf_get_name(buf))
+            local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
             if ok and stats and stats.size > max_filesize then
                 return true
             end
diff --git a/modules/plugins/utility/binds/which-key/config.nix b/modules/plugins/utility/binds/which-key/config.nix
index 7d5ef6c1..625a6215 100644
--- a/modules/plugins/utility/binds/which-key/config.nix
+++ b/modules/plugins/utility/binds/which-key/config.nix
@@ -10,7 +10,7 @@
   inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.binds.whichKey;
-  register = mapAttrsToList (n: v: lib.lists.optional (v != null) (mkLuaInline "{ '${n}', desc = '${v}' }")) cfg.register;
+  register = mapAttrsToList (n: v: lib.lists.optional (! isNull v) (mkLuaInline "{ '${n}', desc = '${v}' }")) cfg.register;
 in {
   config = mkIf cfg.enable {
     vim = {
diff --git a/modules/plugins/utility/harpoon/harpoon.nix b/modules/plugins/utility/harpoon/harpoon.nix
index 6f5b8d0a..4478c938 100644
--- a/modules/plugins/utility/harpoon/harpoon.nix
+++ b/modules/plugins/utility/harpoon/harpoon.nix
@@ -39,7 +39,7 @@ in {
           type = luaInline;
           default = mkLuaInline ''
             function()
-              return vim.uv.cwd()
+              return vim.loop.cwd()
             end
           '';
           description = ''
diff --git a/npins/sources.json b/npins/sources.json
index a5161090..5a962940 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -35,9 +35,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "154e5f578f8925135a9dd23764d4c33a10c7ae36",
-      "url": "https://github.com/yetone/avante.nvim/archive/154e5f578f8925135a9dd23764d4c33a10c7ae36.tar.gz",
-      "hash": "0hx5ccfkn7ljnprzl6qwvb9ba86zrkqysh18zvnaq360g95d4ca1"
+      "revision": "2dd4c040880b271861369b361489a2d418d42648",
+      "url": "https://github.com/yetone/avante.nvim/archive/2dd4c040880b271861369b361489a2d418d42648.tar.gz",
+      "hash": "01j92m0qhd5g6m92rp0qnr4vqqgfrhbx91jbrrcjj1npizynxjm1"
     },
     "base16": {
       "type": "Git",