diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 0d4af7b1cd9f..1438014b4023 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -56,6 +56,7 @@ mapAliases (
     command_T = command-t; # backwards compat, added 2014-10-18
     commentary = vim-commentary;
     committia = committia-vim;
+    completion-treesitter = throw "completion-treesitter has been archived since 2024-01"; # Added 2025-12-18
     concealedyank = concealedyank-vim;
     context-filetype = context_filetype-vim;
     Cosco = cosco-vim;
@@ -104,11 +105,13 @@ mapAliases (
     neomru = neomru-vim;
     neosnippet = neosnippet-vim;
     neuron-nvim = throw "neuron.nvim has been removed: archived repository 2023-02-19"; # Added 2025-09-10
+    nvim-gps = throw "nvim-gps has been archived since 2022. Use nvim-navic instead."; # Added 2025-12-18
     nvim-ts-rainbow = throw "nvim-ts-rainbow has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
     nvim-ts-rainbow2 = throw "nvim-ts-rainbow2 has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30
     open-browser = open-browser-vim;
     pathogen = vim-pathogen;
     peskcolor-vim = throw "peskcolor-vim has been removed: abandoned by upstream"; # Added 2024-08-23
+    playground = throw "playground has been archived"; # Added 2025-12-18
     polyglot = vim-polyglot;
     prettyprint = vim-prettyprint;
     pure-lua = lib.warnOnInstantiate "Please replace 'pure-lua' with 'moonlight-nvim' as this name was an error" moonlight-nvim; # Added 2025-11-17
@@ -137,6 +140,7 @@ mapAliases (
     Supertab = supertab;
     surround = vim-surround;
     Syntastic = syntastic;
+    syntax-tree-surfer = throw "syntax-tree-surfer has been archived"; # Added 2025-12-18
     SyntaxRange = vim-SyntaxRange;
     table-mode = vim-table-mode;
     tabpagebuffer = tabpagebuffer-vim;
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 05a9c1a7c42c..87a7a91ac9c3 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -826,13 +826,6 @@ assertNoAdditions {
     '';
   };
 
-  completion-treesitter = super.completion-treesitter.overrideAttrs {
-    dependencies = with self; [
-      completion-nvim
-      nvim-treesitter
-    ];
-  };
-
   conjure = super.conjure.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
     nvimSkipModules = [
@@ -2519,10 +2512,6 @@ assertNoAdditions {
     doInstallCheck = true;
   };
 
-  nvim-gps = super.nvim-gps.overrideAttrs {
-    dependencies = [ self.nvim-treesitter ];
-  };
-
   nvim-highlight-colors = super.nvim-highlight-colors.overrideAttrs {
     # Test module
     nvimSkipModules = [
@@ -3020,13 +3009,6 @@ assertNoAdditions {
     dependencies = [ self.LibDeflate-nvim ];
   };
 
-  playground = super.playground.overrideAttrs {
-    dependencies = with self; [
-      # we need the 'query' grammar to make
-      (nvim-treesitter.withPlugins (p: [ p.query ]))
-    ];
-  };
-
   poimandres-nvim = super.poimandres-nvim.overrideAttrs {
     # Optional treesitter support
     nvimSkipModules = "poimandres.highlights";
@@ -3381,14 +3363,6 @@ assertNoAdditions {
       };
     });
 
-  syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs (old: {
-    dependencies = [ self.nvim-treesitter ];
-
-    meta = old.meta // {
-      maintainers = with lib.maintainers; [ callumio ];
-    };
-  });
-
   tardis-nvim = super.tardis-nvim.overrideAttrs (old: {
     dependencies = [ self.plenary-nvim ];
     meta = old.meta // {
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index e7d806675e78..0f354e6b5181 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -263,7 +263,6 @@ https://github.com/Zeioth/compiler.nvim/,HEAD,
 https://github.com/steelsojka/completion-buffers/,,
 https://github.com/nvim-lua/completion-nvim/,,
 https://github.com/aca/completion-tabnine/,,
-https://github.com/nvim-treesitter/completion-treesitter/,,
 https://github.com/chikatoike/concealedyank.vim/,,
 https://github.com/rhysd/conflict-marker.vim/,,
 https://github.com/stevearc/conform.nvim/,HEAD,
@@ -855,7 +854,6 @@ https://github.com/vijaymarupudi/nvim-fzf-commands/,,
 https://github.com/sakhnik/nvim-gdb/,,
 https://github.com/chrisgrieser/nvim-genghis/,HEAD,
 https://github.com/booperlv/nvim-gomove/,HEAD,
-https://github.com/smiteshp/nvim-gps/,,
 https://github.com/brenoprata10/nvim-highlight-colors/,HEAD,
 https://github.com/Iron-E/nvim-highlite/,,
 https://github.com/kevinhwang91/nvim-hlslens/,,
@@ -998,7 +996,6 @@ https://github.com/motus/pig.vim/,,
 https://github.com/weirongxu/plantuml-previewer.vim/,HEAD,
 https://github.com/aklt/plantuml-syntax/,,
 https://github.com/goropikari/plantuml.nvim/,HEAD,
-https://github.com/nvim-treesitter/playground/,,
 https://github.com/olivercederborg/poimandres.nvim/,HEAD,
 https://github.com/epwalsh/pomo.nvim/,HEAD,
 https://github.com/dleonard0/pony-vim-syntax/,,
@@ -1133,7 +1130,6 @@ https://github.com/AndrewRadev/switch.vim/,,
 https://github.com/Wansmer/symbol-usage.nvim/,HEAD,
 https://github.com/simrat39/symbols-outline.nvim/,,
 https://github.com/vim-syntastic/syntastic/,,
-https://github.com/ziontee113/syntax-tree-surfer/,HEAD,
 https://github.com/nanozuki/tabby.nvim/,HEAD,
 https://github.com/kdheepak/tabline.nvim/,,
 https://github.com/vim-scripts/tabmerge/,,