diff --git a/flake-modules/nvim.nix b/flake-modules/nvim.nix
index 5b25b7b..6d9ee3e 100644
--- a/flake-modules/nvim.nix
+++ b/flake-modules/nvim.nix
@@ -26,11 +26,52 @@
           config.jhome.nvim.dev.enable = false;
         };
       };
+      moduleNoLsp = {
+        inherit pkgs;
+        extraSpecialArgs = {
+          inherit (inputs) unstable;
+          inherit system;
+        };
+        module = {
+          imports = [ (import ../nvim/standalone.nix { standalone = true; }) ];
+          config.jhome.nvim.dev.bundleLSPs = false;
+        };
+      };
+      moduleNoTSGrammars = {
+        inherit pkgs;
+        extraSpecialArgs = {
+          inherit (inputs) unstable;
+          inherit system;
+        };
+        module = {
+          imports = [ (import ../nvim/standalone.nix { standalone = true; }) ];
+          config.jhome.nvim.dev.bundleGrammars = false;
+        };
+      };
+      moduleNoBundledBins = {
+        inherit pkgs;
+        extraSpecialArgs = {
+          inherit (inputs) unstable;
+          inherit system;
+        };
+        module = {
+          imports = [ (import ../nvim/standalone.nix { standalone = true; }) ];
+          config.jhome.nvim.dev = {
+            bundleLSPs = false;
+            bundleGrammars = false;
+          };
+        };
+      };
     in
     {
       # Check standalone nvim build
-      checks.nvimDev = nixvimLib.check.mkTestDerivationFromNixvimModule moduleDev;
-      checks.nvimHeadless = nixvimLib.check.mkTestDerivationFromNixvimModule moduleHeadless;
+      checks = {
+        nvimDev = nixvimLib.check.mkTestDerivationFromNixvimModule moduleDev;
+        nvimHeadless = nixvimLib.check.mkTestDerivationFromNixvimModule moduleHeadless;
+        nvimNoLsp = nixvimLib.check.mkTestDerivationFromNixvimModule moduleNoLsp;
+        nvimNoTSGrammars = nixvimLib.check.mkTestDerivationFromNixvimModule moduleNoTSGrammars;
+        nvimNoBundledBins = nixvimLib.check.mkTestDerivationFromNixvimModule moduleNoBundledBins;
+      };
 
       # Nvim standalone module
       packages.nvim = nixvim.makeNixvimWithModule moduleDev;
diff --git a/nvim/dev-plugins.nix b/nvim/dev-plugins.nix
index 948d769..31c4096 100644
--- a/nvim/dev-plugins.nix
+++ b/nvim/dev-plugins.nix
@@ -41,7 +41,7 @@ in
       # Configure LSPs
       {
         plugins = {
-          lsp.servers.bashls.package = pkgs.bash-language-server;
+          lsp.servers.bashls.package = lib.mkDefault pkgs.bash-language-server;
           lspkind = {
             enable = true;
             mode = "symbol";