diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index c7d8b3d7..982102ac 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -405,7 +405,7 @@
 
 [aionoid](https://github.com/aionoid):
 
-[avante.nvim]: https://github.com/yetone/avante.nvim
+[avante-nvim]: https://github.com/yetone/avante.nvim
 
 - Fix [render-markdown.nvim] file_types option type to list, to accept merging.
 - Add [avante.nvim] plugin under `vim.assistant.avante-nvim`.
@@ -581,14 +581,6 @@
 [typst-concealer]: https://github.com/PartyWumpus/typst-concealer
 
 - Add inline typst concealing support under `vim.languages.typst` using
-  [typst-concealer].
-
-[KrappRamiro](https://github.com/KrappRamiro):
-
-[phaazon/hop.nvim]: https://github.com/hadronized/hop.nvim
-[smoka7/hop.nvim]: https://github.com/smoka7/hop.nvim
-
-- Migrate [phaazon/hop.nvim] to [smoka7/hop.nvim]
   [typst-concealer]. [simon-wg](https://github.com/simon-wg):
 
 - Update `python` language module to use correct lsp binary.
diff --git a/flake/pkgs/by-name/avante-nvim/package.nix b/flake/pkgs/by-name/avante-nvim/package.nix
index 20b6f3c5..c7b5ac76 100644
--- a/flake/pkgs/by-name/avante-nvim/package.nix
+++ b/flake/pkgs/by-name/avante-nvim/package.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   pins,
   openssl,
   pkg-config,
@@ -12,8 +11,6 @@
 }: let
   # From npins
   pin = pins.avante-nvim;
-
-  pname = "avante-nvim-lib";
   version = pin.branch;
   src = pkgs.fetchFromGitHub {
     inherit (pin.repository) owner repo;
@@ -22,7 +19,8 @@
   };
 
   avante-nvim-lib = rustPlatform.buildRustPackage {
-    inherit pname version src;
+    pname = "avante-nvim-lib";
+    inherit version src;
 
     cargoHash = "sha256-pTWCT2s820mjnfTscFnoSKC37RE7DAPKxP71QuM+JXQ=";
 
@@ -45,8 +43,6 @@
       "--skip=test_roundtrip"
       "--skip=test_fetch_md"
     ];
-
-    env.RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
   };
 in
   vimUtils.buildVimPlugin {
@@ -68,15 +64,7 @@ in
       # Requires setup with corresponding provider
       "avante.providers.azure"
       "avante.providers.copilot"
-      "avante.providers.gemini"
-      "avante.providers.ollama"
-      "avante.providers.vertex"
       "avante.providers.vertex_claude"
+      "avante.providers.ollama"
     ];
-
-    meta = {
-      description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE";
-      homepage = "https://github.com/yetone/avante.nvim";
-      license = lib.licenses.asl20;
-    };
   }
diff --git a/flake/pkgs/by-name/blink-cmp/package.nix b/flake/pkgs/by-name/blink-cmp/package.nix
index 7c6371d1..5dba17a6 100644
--- a/flake/pkgs/by-name/blink-cmp/package.nix
+++ b/flake/pkgs/by-name/blink-cmp/package.nix
@@ -1,19 +1,17 @@
 {
-  lib,
-  stdenv,
   rustPlatform,
   fetchFromGitHub,
   writeShellScriptBin,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "blink-cmp";
-  version = "1.8.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.cmp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JjlcPj7v9J+v1SDBYIub6jFEslLhZGHmsipV1atUAFo=";
+    hash = "sha256-IHRYgKcYP+JDGu8Vtawgzlhq25vpROFqb8KmpfVMwCk=";
   };
 
   forceShare = [
@@ -31,24 +29,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mv "$out/lib" "$out/target/release"
   '';
 
-  cargoHash = "sha256-Qdt8O7IGj2HySb1jxsv3m33ZxJg96Ckw26oTEEyQjfs=";
+  cargoHash = "sha256-QsVCugYWRri4qu64wHnbJQZBhy4tQrr+gCYbXtRBlqE=";
 
   nativeBuildInputs = [
     (writeShellScriptBin "git" "exit 1")
   ];
 
-  env = {
-    RUSTC_BOOTSTRAP = true;
-
-    # Those are the Linker args used by upstream. Without those, the build fails.
-    # See:
-    #  <https://github.com/saghen/blink.cmp/blob/main/.cargo/config.toml#L1C1-L11C2>
-    RUSTFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-C link-arg=-undefined -C link-arg=dynamic_lookup";
-  };
-
-  meta = {
-    description = "Performant, batteries-included completion plugin for Neovim";
-    homepage = "https://github.com/saghen/blink.cmp";
-    changelog = "https://github.com/Saghen/blink.cmp/blob/v${finalAttrs.version}/CHANGELOG.md";
-  };
+  env.RUSTC_BOOTSTRAP = true;
 })
diff --git a/npins/sources.json b/npins/sources.json
index 20867776..eb9694d1 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -708,21 +708,18 @@
       "url": "https://github.com/tzachar/highlight-undo.nvim/archive/ee32e12693d70e66f954d09a504a7371d110fc27.tar.gz",
       "hash": "09byybwyl61jxlfii9vsi4i21vy6ngm3mbypqlhsivn8wgg24kn9"
     },
-    "hop.nvim": {
-      "type": "GitRelease",
+    "hop-nvim": {
+      "type": "Git",
       "repository": {
         "type": "GitHub",
-        "owner": "smoka7",
+        "owner": "phaazon",
         "repo": "hop.nvim"
       },
-      "pre_releases": false,
-      "version_upper_bound": null,
-      "release_prefix": null,
+      "branch": "master",
       "submodules": false,
-      "version": "v2.7.2",
-      "revision": "08ddca799089ab96a6d1763db0b8adc5320bf050",
-      "url": "https://api.github.com/repos/smoka7/hop.nvim/tarball/v2.7.2",
-      "hash": "07mydcm3x7xc7x6wg5l6kcx8yrrv9bwy2p44y17ajyx37c5lmwwn"
+      "revision": "1a1eceafe54b5081eae4cb91c723abd1d450f34b",
+      "url": "https://github.com/phaazon/hop.nvim/archive/1a1eceafe54b5081eae4cb91c723abd1d450f34b.tar.gz",
+      "hash": "08h18cam2yr57qvfsnf1bra28vbl6013wlchnr5crb757xw8aysa"
     },
     "hunk-nvim": {
       "type": "GitRelease",