diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c1c62e9a09aa..843c86b6ef5a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17712,6 +17712,12 @@
     githubId = 34910574;
     keys = [ { fingerprint = "D055 8A23 3947 B7A0 F966  B07F 0B41 0348 9833 7273"; } ];
   };
+  Oops418 = {
+    email = "oooopsxxx@gmail.com";
+    github = "Oops418";
+    name = "Oops418";
+    githubId = 93655215;
+  };
   oosquare = {
     name = "Justin Chen";
     email = "oosquare@outlook.com";
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4d858dd45bd4..9fe8ebebfa3a 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3902,6 +3902,8 @@ let
         };
       };
 
+      oops418.nix-env-picker = callPackage ./oops418.nix-env-picker { };
+
       phind.phind = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "phind";
diff --git a/pkgs/applications/editors/vscode/extensions/oops418.nix-env-picker/default.nix b/pkgs/applications/editors/vscode/extensions/oops418.nix-env-picker/default.nix
new file mode 100644
index 000000000000..a9557af16a9d
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/oops418.nix-env-picker/default.nix
@@ -0,0 +1,17 @@
+{ lib, vscode-utils }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "nix-env-picker";
+    publisher = "io-github-oops418";
+    version = "0.0.4";
+    hash = "sha256-LGw7Pd72oVgMqhKPX1dV2EgluX0/4rvKVb7Fx2H6hOI=";
+  };
+  meta = {
+    description = "A Visual Studio Code extension for seamless switching between Nix shells and flakes.";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=io-github-oops418.nix-env-picker";
+    homepage = "https://github.com/Oops418/nix-env-picker";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.Oops418 ];
+  };
+}