fix tabbyml plugin
This commit is contained in:
parent
91b9f31c3f
commit
b4a93f588f
3 changed files with 4 additions and 8 deletions
|
@ -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 = {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -36,5 +36,5 @@ cmp.setup({
|
|||
end
|
||||
end, { "i", "s" }),
|
||||
}),
|
||||
sources = @cmpSources@,
|
||||
sources = cmp.config.sources(@cmpSources@),
|
||||
})
|
||||
|
|
Reference in a new issue