diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 41d539dd5f1..303c430b8e5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -224,10 +224,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/top-level/emacs-packages.nix              @adisbladis
 
 # Neovim
-/pkgs/applications/editors/neovim      @jonringer @teto
+/pkgs/applications/editors/neovim      @figsoda @jonringer @teto
 
 # VimPlugins
-/pkgs/applications/editors/vim/plugins         @jonringer
+/pkgs/applications/editors/vim/plugins         @figsoda @jonringer
 
 # VsCode Extensions
 /pkgs/applications/editors/vscode/extensions   @jonringer
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 5e5a61875db..af6684a03f9 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -743,6 +743,7 @@ with lib.maintainers; {
 
   vim = {
     members = [
+      figsoda
       jonringer
       softinio
       teto