diff --git a/neovim.nix b/neovim.nix
index a027cdb..5badf1e 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -53,18 +53,13 @@ let
   basicConfigs = map readFile [ ./config/basic.lua ];
   pluginConfigs = catAttrs "luaConfig" pluginsSettings;
   allConfigs = basicConfigs ++ pluginConfigs ++ [ extraLuaConfig ];
-
-  # TODO: DRY
-  tabbymlEnable = lib.attrByPath [ "tabbyml" "enable" ] false plugins;
-  nodeJsEnable = tabbymlEnable;
-
 in
 (wrapNeovim neovim-unwrapped {
   inherit viAlias;
   inherit vimAlias;
 
   withPython3 = false;
-  withNodeJs = nodeJsEnable;
+  withNodeJs = false;
   withRuby = false;
 
   configure = {
diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix
index a774769..eae556d 100644
--- a/plugins/lsp/default.nix
+++ b/plugins/lsp/default.nix
@@ -15,6 +15,7 @@ let
   tabbymlEnable = lib.attrByPath [ "tabbyml" "enable" ] false plugins;
   tabbymlDefaultSettings = {
     host = "http://127.0.0.1:8080";
+    max_lines = 100;
   };
   tabbymlSettings = lib.toLua (lib.attrByPath [ "tabbyml" "settings" ] tabbymlDefaultSettings plugins);
   tabbymlLuaConfig = lib.optional tabbymlEnable
@@ -24,7 +25,7 @@ let
     { name = "nvim_lsp"; }
     { name = "luasnip"; }
     { name = "orgmode"; }
-  ] ++ lib.optional tabbymlEnable [{ name = "cmp-tabby"; }]);
+  ] ++ lib.optional tabbymlEnable [{ name = "cmp_tabby"; }]);
   cmpLuaConfig = lib.readSubFile ./nvim-cmp.lua { inherit cmpSources; };
 
   lspconfigLuaConfig = lib.readSubFile ./lspconfig.lua
diff --git a/plugins/lsp/nvim-cmp.lua b/plugins/lsp/nvim-cmp.lua
index 7b849ed..49f5e9d 100644
--- a/plugins/lsp/nvim-cmp.lua
+++ b/plugins/lsp/nvim-cmp.lua
@@ -36,5 +36,5 @@ cmp.setup({
 			end
 		end, { "i", "s" }),
 	}),
-	sources = @cmpSources@,
+	sources = cmp.config.sources(@cmpSources@),
 })