fix(nvim): clean up nix-develop fork
All checks were successful
Discord / discord commits (push) Has been skipped

This commit is contained in:
matt1432 2024-12-22 12:53:27 -05:00
parent ae8e828514
commit 4044403520
9 changed files with 16 additions and 17 deletions

Binary file not shown.

View file

@ -29,9 +29,9 @@ in {
if (devShells['c-lang'] == nil) then if (devShells['c-lang'] == nil) then
devShells['c-lang'] = 1; 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]]; vim.cmd[[LspStart]];
end)); end);
end end
end, end,
}); });

View file

@ -70,10 +70,10 @@ in {
if (devShells['csharp'] == nil) then if (devShells['csharp'] == nil) then
devShells['csharp'] = 1; devShells['csharp'] = 1;
require('nix-develop').nix_develop({'${flakeEnv}#csharp'}, vim.schedule_wrap(function() require('nix-develop').nix_develop({'${flakeEnv}#csharp'}, function()
startRoslyn(); startRoslyn();
vim.cmd[[e]]; -- reload to attach on current file vim.cmd[[e]]; -- reload to attach on current file
end)); end);
end end
end, end,
}); });

View file

@ -75,7 +75,6 @@ in {
; ;
}) })
++ [ ++ [
# FIXME: defer inside plugin instead
(pkgs.vimPlugins.nix-develop-nvim.overrideAttrs (o: { (pkgs.vimPlugins.nix-develop-nvim.overrideAttrs (o: {
name = "vimplugin-${o.pname}-${mkVersion nix-develop-nvim-src}"; name = "vimplugin-${o.pname}-${mkVersion nix-develop-nvim-src}";
src = nix-develop-nvim-src; src = nix-develop-nvim-src;

View file

@ -23,9 +23,9 @@ in {
if (devShells['json'] == nil) then if (devShells['json'] == nil) then
devShells['json'] = 1; 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]]; vim.cmd[[LspStart]];
end)); end);
end end
end, end,
}); });

View file

@ -31,9 +31,9 @@ in {
if (devShells['lua'] == nil) then if (devShells['lua'] == nil) then
devShells['lua'] = 1; 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]]; vim.cmd[[LspStart]];
end)); end);
end end
end, end,
}); });

View file

@ -35,9 +35,9 @@ in {
if (devShells['markdown'] == nil) then if (devShells['markdown'] == nil) then
devShells['markdown'] = 1; 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]]; vim.cmd[[LspStart]];
end)); end);
end end
end, end,
}); });

View file

@ -23,9 +23,9 @@ in {
if (devShells['rust'] == nil) then if (devShells['rust'] == nil) then
devShells['rust'] = 1; 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]]; vim.cmd[[LspStart]];
end)); end);
end end
end, end,
}); });

View file

@ -29,9 +29,9 @@ in {
if (devShells['web'] == nil) then if (devShells['web'] == nil) then
devShells['web'] = 1; 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]]; vim.cmd[[LspStart]];
end)); end);
end end
end, end,
}); });
@ -45,9 +45,9 @@ in {
if (devShells['web'] == nil) then if (devShells['web'] == nil) then
devShells['web'] = 1; 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]]; vim.cmd[[LspStart]];
end)); end);
end end
end, end,
}); });