Compare commits

...

2 commits

2 changed files with 3 additions and 4 deletions

View file

@ -7,10 +7,9 @@
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.lists) optional optionals; inherit (lib.lists) optional optionals;
inherit (lib.trivial) boolToString; inherit (lib.trivial) boolToString;
inherit (lib.nvim.lists) listContainsValues;
inherit (lib.nvim.binds) mkSetBinding addDescriptionsToMappings; inherit (lib.nvim.binds) mkSetBinding addDescriptionsToMappings;
inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.dag) entryBefore entryAnywhere; inherit (lib.nvim.dag) entryBefore entryAfter;
cfg = config.vim.treesitter; cfg = config.vim.treesitter;
usingNvimCmp = config.vim.autocomplete.enable && config.vim.autocomplete.type == "nvim-cmp"; usingNvimCmp = config.vim.autocomplete.enable && config.vim.autocomplete.type == "nvim-cmp";
@ -45,7 +44,7 @@ in {
set nofoldenable set nofoldenable
''); '');
luaConfigRC.treesitter = entryAnywhere '' luaConfigRC.treesitter = entryAfter ["basic"] ''
require('nvim-treesitter.configs').setup { require('nvim-treesitter.configs').setup {
-- Disable imperative treesitter options that would attempt to fetch -- Disable imperative treesitter options that would attempt to fetch
-- grammars into the read-only Nix store. To add additional grammars here -- grammars into the read-only Nix store. To add additional grammars here

View file

@ -24,7 +24,7 @@ in {
trim_scope = '${cfg.trimScope}', trim_scope = '${cfg.trimScope}',
mode = '${cfg.mode}', mode = '${cfg.mode}',
separator = ${nullString cfg.separator}, separator = ${nullString cfg.separator},
max_lines = ${toString cfg.zindex}, z_index = ${toString cfg.zindex},
} }
''; '';
}; };