diff --git a/flake.lock b/flake.lock
index c1cda841..9221f43f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "blink-cmp": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1739129359,
+        "narHash": "sha256-nUrXXiJ7NRxS21H53U323lwEKdo08Y011l8XskXC/vw=",
+        "owner": "saghen",
+        "repo": "blink.cmp",
+        "rev": "b2485c76cb7877de6fe9c8670af59ba3d72fd74d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "saghen",
+        "repo": "blink.cmp",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -121,6 +137,7 @@
     },
     "root": {
       "inputs": {
+        "blink-cmp": "blink-cmp",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
         "mnw": "mnw",
diff --git a/flake.nix b/flake.nix
index acef6382..1c559bd7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,5 +98,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
+
+    blink-cmp = {
+      url = "github:saghen/blink.cmp";
+      flake = false;
+    };
   };
 }
diff --git a/flake/legacyPackages.nix b/flake/legacyPackages.nix
index 33aee0e3..d5b5aacd 100644
--- a/flake/legacyPackages.nix
+++ b/flake/legacyPackages.nix
@@ -1,8 +1,4 @@
-{
-  inputs,
-  self,
-  ...
-}: {
+{inputs, ...}: {
   perSystem = {
     system,
     inputs',
@@ -13,21 +9,14 @@
       overlays = [
         inputs.self.overlays.default
 
-        (final: prev: {
+        (final: _: {
           # Build nil from source to get most recent
           # features as they are added.
           nil = inputs'.nil.packages.default;
-          blink-cmp = let
-            pin = self.pins.blink-cmp;
-          in
-            final.callPackage ./legacyPackages/blink-cmp.nix {
-              inherit (pin) version;
-              src = prev.fetchFromGitHub {
-                inherit (pin.repository) owner repo;
-                rev = pin.revision;
-                sha256 = pin.hash;
-              };
-            };
+          blink-cmp = final.callPackage ./legacyPackages/blink-cmp.nix {
+            src = inputs.blink-cmp;
+            version = inputs.blink-cmp.shortRev or inputs.blink-cmp.shortDirtyRev or "dirty";
+          };
         })
       ];
     };
diff --git a/flake/legacyPackages/blink-cmp.nix b/flake/legacyPackages/blink-cmp.nix
index 924cb4cc..002269b9 100644
--- a/flake/legacyPackages/blink-cmp.nix
+++ b/flake/legacyPackages/blink-cmp.nix
@@ -10,16 +10,16 @@
     pname = "blink-fuzzy-lib";
     inherit version src;
 
-    # TODO: remove this if plugin stops using nightly rust
-    env.RUSTC_BOOTSTRAP = true;
-
+    env = {
+      # TODO: remove this if plugin stops using nightly rust
+      RUSTC_BOOTSTRAP = true;
+    };
     nativeBuildInputs = [git];
     cargoLock = {
       lockFile = "${src}/Cargo.lock";
       allowBuiltinFetchGit = true;
     };
   };
-
   libExt =
     if hostPlatform.isDarwin
     then "dylib"
diff --git a/modules/plugins/assistant/chatgpt/config.nix b/modules/plugins/assistant/chatgpt/config.nix
index 95a36acf..3caa221f 100644
--- a/modules/plugins/assistant/chatgpt/config.nix
+++ b/modules/plugins/assistant/chatgpt/config.nix
@@ -30,19 +30,17 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["chatgpt-nvim"];
-
+      startPlugins = [
+        "chatgpt"
+      ];
       pluginRC.chagpt = entryAnywhere ''
         require("chatgpt").setup(${toLuaObject cfg.setupOpts})
       '';
-
-      maps = {
-        visual = maps;
-        normal = mkMerge [
-          (mkSetBinding mappings.chatGpt "<cmd>ChatGPT<CR>")
-          maps
-        ];
-      };
+      maps.normal = mkMerge [
+        (mkSetBinding mappings.chatGpt "<cmd>ChatGPT<CR>")
+        maps
+      ];
+      maps.visual = maps;
     };
   };
 }
diff --git a/modules/plugins/languages/csharp.nix b/modules/plugins/languages/csharp.nix
index af7f36e0..5011c5cc 100644
--- a/modules/plugins/languages/csharp.nix
+++ b/modules/plugins/languages/csharp.nix
@@ -75,8 +75,8 @@
   };
 
   extraServerPlugins = {
-    omnisharp = ["omnisharp-extended-lsp-nvim"];
-    csharp_ls = ["csharpls-extended-lsp-nvim"];
+    omnisharp = ["omnisharp-extended"];
+    csharp_ls = ["csharpls-extended"];
   };
 
   cfg = config.vim.languages.csharp;
diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix
index 4f8a7028..e2b3182e 100644
--- a/modules/plugins/languages/dart.nix
+++ b/modules/plugins/languages/dart.nix
@@ -137,7 +137,7 @@ in {
       vim.startPlugins =
         if ftcfg.enableNoResolvePatch
         then ["flutter-tools-patched"]
-        else ["flutter-tools-nvim"];
+        else ["flutter-tools"];
 
       vim.pluginRC.flutter-tools = entryAnywhere ''
         require('flutter-tools').setup {
diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix
index f8f338b1..145746a7 100644
--- a/modules/plugins/languages/elixir.nix
+++ b/modules/plugins/languages/elixir.nix
@@ -112,7 +112,7 @@ in {
     })
 
     (mkIf cfg.elixir-tools.enable {
-      vim.startPlugins = ["elixir-tools-nvim"];
+      vim.startPlugins = ["elixir-tools"];
       vim.pluginRC.elixir-tools = entryAnywhere ''
         local elixir = require("elixir")
         local elixirls = require("elixir.elixirls")
diff --git a/modules/plugins/languages/ts.nix b/modules/plugins/languages/ts.nix
index c9070554..50e6d91c 100644
--- a/modules/plugins/languages/ts.nix
+++ b/modules/plugins/languages/ts.nix
@@ -230,7 +230,7 @@ in {
 
     # Extensions
     (mkIf cfg.extensions."ts-error-translator".enable {
-      vim.startPlugins = ["ts-error-translator-nvim"];
+      vim.startPlugins = ["ts-error-translator"];
       vim.pluginRC.ts-error-translator = entryAnywhere ''
         require("ts-error-translator").setup(${toLuaObject cfg.extensions.ts-error-translator.setupOpts})
       '';
diff --git a/modules/plugins/notes/orgmode/config.nix b/modules/plugins/notes/orgmode/config.nix
index 3f1b7eaf..36e08088 100644
--- a/modules/plugins/notes/orgmode/config.nix
+++ b/modules/plugins/notes/orgmode/config.nix
@@ -13,7 +13,9 @@ in {
   config = mkIf cfg.enable (mkMerge [
     {
       vim = {
-        startPlugins = ["orgmode"];
+        startPlugins = [
+          "orgmode-nvim"
+        ];
 
         binds.whichKey.register = pushDownDefault {
           "<leader>o" = "+Notes";
diff --git a/modules/plugins/session/nvim-session-manager/config.nix b/modules/plugins/session/nvim-session-manager/config.nix
index 3585b715..5d345c71 100644
--- a/modules/plugins/session/nvim-session-manager/config.nix
+++ b/modules/plugins/session/nvim-session-manager/config.nix
@@ -15,7 +15,7 @@ in {
     vim = {
       startPlugins =
         [
-          "neovim-session-manager"
+          "nvim-session-manager"
           "plenary-nvim"
         ]
         ++ optionals cfg.usePicker ["dressing-nvim"];
diff --git a/modules/plugins/visuals/cellular-automaton/config.nix b/modules/plugins/visuals/cellular-automaton/config.nix
index 10c305b3..2c0c4669 100644
--- a/modules/plugins/visuals/cellular-automaton/config.nix
+++ b/modules/plugins/visuals/cellular-automaton/config.nix
@@ -13,7 +13,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["cellular-automaton-nvim"];
+      startPlugins = ["cellular-automaton"];
 
       maps.normal = mkBinding cfg.mappings.makeItRain "<cmd>CellularAutomaton make_it_rain<CR>" "Make it rain";
 
diff --git a/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix b/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix
index 5b2102ce..a7fd3752 100644
--- a/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix
+++ b/modules/plugins/visuals/tiny-devicons-auto-colors/config.nix
@@ -11,7 +11,7 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      startPlugins = ["tiny-devicons-auto-colors-nvim" "nvim-web-devicons"];
+      startPlugins = ["tiny-devicons-auto-colors" "nvim-web-devicons"];
 
       pluginRC.tiny-devicons-auto-colors = entryAnywhere ''
         require("tiny-devicons-auto-colors").setup(${toLuaObject cfg.setupOpts})
diff --git a/npins/sources.json b/npins/sources.json
index 2bcda9ea..929da85c 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -36,21 +36,6 @@
       "url": "https://github.com/rrethy/base16-nvim/archive/6ac181b5733518040a33017dde654059cd771b7c.tar.gz",
       "hash": "0q47jbh6abn2hql9ghi9ayx3l8pdrdcdrnf4qfk7cp0v1bl7y48r"
     },
-    "blink-cmp": {
-      "type": "GitRelease",
-      "repository": {
-        "type": "GitHub",
-        "owner": "saghen",
-        "repo": "blink.cmp"
-      },
-      "pre_releases": false,
-      "version_upper_bound": null,
-      "release_prefix": null,
-      "version": "v0.11.0",
-      "revision": "7a70199efe4e333a3693ba3e56ddbec3b9c9c330",
-      "url": "https://api.github.com/repos/saghen/blink.cmp/tarball/v0.11.0",
-      "hash": "1j3sj03i72iw5npwwksc7w7axv8z0nbgi11adkfng9ak73kn1gdq"
-    },
     "blink-compat": {
       "type": "Git",
       "repository": {