diff --git a/flake.lock b/flake.lock
index 1e60b8fa..d1078249 100644
Binary files a/flake.lock and b/flake.lock differ
diff --git a/homeManagerModules/neovim/langs/c-lang/default.nix b/homeManagerModules/neovim/langs/c-lang/default.nix
index ae519d0c..342f1834 100644
--- a/homeManagerModules/neovim/langs/c-lang/default.nix
+++ b/homeManagerModules/neovim/langs/c-lang/default.nix
@@ -29,9 +29,9 @@ in {
                     if (devShells['c-lang'] == nil) then
                         devShells['c-lang'] = 1;
 
-                        require('nix-develop').nix_develop({'${flakeEnv}#c-lang'}, vim.schedule_wrap(function()
+                        require('nix-develop').nix_develop({'${flakeEnv}#c-lang'}, function()
                             vim.cmd[[LspStart]];
-                        end));
+                        end);
                     end
                 end,
             });
diff --git a/homeManagerModules/neovim/langs/csharp/default.nix b/homeManagerModules/neovim/langs/csharp/default.nix
index 0907a0fb..4561f160 100644
--- a/homeManagerModules/neovim/langs/csharp/default.nix
+++ b/homeManagerModules/neovim/langs/csharp/default.nix
@@ -70,10 +70,10 @@ in {
                         if (devShells['csharp'] == nil) then
                             devShells['csharp'] = 1;
 
-                            require('nix-develop').nix_develop({'${flakeEnv}#csharp'}, vim.schedule_wrap(function()
+                            require('nix-develop').nix_develop({'${flakeEnv}#csharp'}, function()
                                 startRoslyn();
                                 vim.cmd[[e]]; -- reload to attach on current file
-                            end));
+                            end);
                         end
                     end,
                 });
diff --git a/homeManagerModules/neovim/langs/default.nix b/homeManagerModules/neovim/langs/default.nix
index c285c9e7..63b50cbc 100644
--- a/homeManagerModules/neovim/langs/default.nix
+++ b/homeManagerModules/neovim/langs/default.nix
@@ -75,7 +75,6 @@ in {
             ;
         })
         ++ [
-          # FIXME: defer inside plugin instead
           (pkgs.vimPlugins.nix-develop-nvim.overrideAttrs (o: {
             name = "vimplugin-${o.pname}-${mkVersion nix-develop-nvim-src}";
             src = nix-develop-nvim-src;
diff --git a/homeManagerModules/neovim/langs/json/default.nix b/homeManagerModules/neovim/langs/json/default.nix
index 8fad537b..fc172dca 100644
--- a/homeManagerModules/neovim/langs/json/default.nix
+++ b/homeManagerModules/neovim/langs/json/default.nix
@@ -23,9 +23,9 @@ in {
                     if (devShells['json'] == nil) then
                         devShells['json'] = 1;
 
-                        require('nix-develop').nix_develop({'${flakeEnv}#json'}, vim.schedule_wrap(function()
+                        require('nix-develop').nix_develop({'${flakeEnv}#json'}, function()
                             vim.cmd[[LspStart]];
-                        end));
+                        end);
                     end
                 end,
             });
diff --git a/homeManagerModules/neovim/langs/lua/default.nix b/homeManagerModules/neovim/langs/lua/default.nix
index 1dc722c1..8dace085 100644
--- a/homeManagerModules/neovim/langs/lua/default.nix
+++ b/homeManagerModules/neovim/langs/lua/default.nix
@@ -31,9 +31,9 @@ in {
                         if (devShells['lua'] == nil) then
                             devShells['lua'] = 1;
 
-                            require('nix-develop').nix_develop({'${flakeEnv}#lua'}, vim.schedule_wrap(function()
+                            require('nix-develop').nix_develop({'${flakeEnv}#lua'}, function()
                                 vim.cmd[[LspStart]];
-                            end));
+                            end);
                         end
                     end,
                 });
diff --git a/homeManagerModules/neovim/langs/markdown/default.nix b/homeManagerModules/neovim/langs/markdown/default.nix
index a80b1390..fc292fb7 100644
--- a/homeManagerModules/neovim/langs/markdown/default.nix
+++ b/homeManagerModules/neovim/langs/markdown/default.nix
@@ -35,9 +35,9 @@ in {
                     if (devShells['markdown'] == nil) then
                         devShells['markdown'] = 1;
 
-                        require('nix-develop').nix_develop({'${flakeEnv}#markdown'}, vim.schedule_wrap(function()
+                        require('nix-develop').nix_develop({'${flakeEnv}#markdown'}, function()
                             vim.cmd[[LspStart]];
-                        end));
+                        end);
                     end
                 end,
             });
diff --git a/homeManagerModules/neovim/langs/rust/default.nix b/homeManagerModules/neovim/langs/rust/default.nix
index 917c2ea8..19d20d39 100644
--- a/homeManagerModules/neovim/langs/rust/default.nix
+++ b/homeManagerModules/neovim/langs/rust/default.nix
@@ -23,9 +23,9 @@ in {
                     if (devShells['rust'] == nil) then
                         devShells['rust'] = 1;
 
-                        require('nix-develop').nix_develop({'${flakeEnv}#rust'}, vim.schedule_wrap(function()
+                        require('nix-develop').nix_develop({'${flakeEnv}#rust'}, function()
                             vim.cmd[[LspStart]];
-                        end));
+                        end);
                     end
                 end,
             });
diff --git a/homeManagerModules/neovim/langs/web/default.nix b/homeManagerModules/neovim/langs/web/default.nix
index df9aa769..efdec8eb 100644
--- a/homeManagerModules/neovim/langs/web/default.nix
+++ b/homeManagerModules/neovim/langs/web/default.nix
@@ -29,9 +29,9 @@ in {
                     if (devShells['web'] == nil) then
                         devShells['web'] = 1;
 
-                        require('nix-develop').nix_develop({'${flakeEnv}#web'}, vim.schedule_wrap(function()
+                        require('nix-develop').nix_develop({'${flakeEnv}#web'}, function()
                             vim.cmd[[LspStart]];
-                        end));
+                        end);
                     end
                 end,
             });
@@ -45,9 +45,9 @@ in {
                     if (devShells['web'] == nil) then
                         devShells['web'] = 1;
 
-                        require('nix-develop').nix_develop({'${flakeEnv}#web'}, vim.schedule_wrap(function()
+                        require('nix-develop').nix_develop({'${flakeEnv}#web'}, function()
                             vim.cmd[[LspStart]];
-                        end));
+                        end);
                     end
                 end,
             });