mirror of
https://github.com/NotAShelf/neovim-flake.git
synced 2024-12-25 06:49:49 +01:00
7dbd1cd8d1
* modules/completion: rewrite
* treewide: remove vsnip, add luasnip
* nvim-cmp: add default sorting
* nvim-cmp: load after luasnip
* lib: fix docs for mergelessListOf
* docs: add changelog entires for rewrite
* deprecations: add rewrite deprecations
* nvim-cmp: clarify in format description
* docs: fix option reference in release notes
* treewide: remove reduant `// {default = false;}`s
* luasnip: add missing `{option}` for option reference
* deprecations: add entry for vsnip
* nvim-autopairs: use multiline string
* nvim-dap: use outer attribute
92 lines
3.7 KiB
Nix
92 lines
3.7 KiB
Nix
{
|
|
config,
|
|
pkgs,
|
|
lib,
|
|
...
|
|
}: let
|
|
inherit (lib.modules) mkIf mkMerge;
|
|
inherit (lib.lists) optional optionals;
|
|
inherit (lib.nvim.binds) mkSetBinding addDescriptionsToMappings;
|
|
inherit (lib.nvim.lua) toLuaObject;
|
|
inherit (lib.nvim.dag) entryBefore entryAfter;
|
|
|
|
cfg = config.vim.treesitter;
|
|
usingNvimCmp = config.vim.autocomplete.nvim-cmp.enable;
|
|
|
|
self = import ./treesitter.nix {inherit pkgs lib;};
|
|
mappingDefinitions = self.options.vim.treesitter.mappings;
|
|
mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
|
|
in {
|
|
config = mkIf cfg.enable {
|
|
vim = {
|
|
startPlugins = ["nvim-treesitter"] ++ optional usingNvimCmp "cmp-treesitter";
|
|
|
|
autocomplete.nvim-cmp.sources = {treesitter = "[Treesitter]";};
|
|
treesitter.grammars = optionals cfg.addDefaultGrammars cfg.defaultGrammars;
|
|
|
|
maps = {
|
|
# HACK: Using mkSetLuaBinding and putting the lua code does not work for some reason: It just selects the whole file.
|
|
# This works though, and if it ain't broke, don't fix it.
|
|
normal = mkSetBinding mappings.incrementalSelection.init ":lua require('nvim-treesitter.incremental_selection').init_selection()<CR>";
|
|
|
|
visualOnly = mkMerge [
|
|
(mkSetBinding mappings.incrementalSelection.incrementByNode "<cmd>lua require('nvim-treesitter.incremental_selection').node_incremental()<CR>")
|
|
(mkSetBinding mappings.incrementalSelection.incrementByScope "<cmd>lua require('nvim-treesitter.incremental_selection').scope_incremental()<CR>")
|
|
(mkSetBinding mappings.incrementalSelection.decrementByNode "<cmd>lua require('nvim-treesitter.incremental_selection').node_decremental()<CR>")
|
|
];
|
|
};
|
|
|
|
# For some reason treesitter highlighting does not work on start if this is set before syntax on
|
|
pluginRC.treesitter-fold = mkIf cfg.fold (entryBefore ["basic"] ''
|
|
-- This is required by treesitter-context to handle folds
|
|
vim.o.foldmethod = "expr"
|
|
vim.o.foldexpr = "nvim_treesitter#foldexpr()"
|
|
|
|
-- This is optional, but is set rather as a sane default.
|
|
-- If unset, opened files will be folded by automatically as
|
|
-- the files are opened
|
|
vim.o.foldenable = false
|
|
'');
|
|
|
|
pluginRC.treesitter = entryAfter ["basic"] ''
|
|
require('nvim-treesitter.configs').setup {
|
|
-- Disable imperative treesitter options that would attempt to fetch
|
|
-- grammars into the read-only Nix store. To add additional grammars here
|
|
-- you must use the `config.vim.treesitter.grammars` option.
|
|
auto_install = false,
|
|
sync_install = false,
|
|
ensure_installed = {},
|
|
|
|
-- Indentation module for Treesitter
|
|
indent = {
|
|
enable = ${toLuaObject cfg.indent.enable},
|
|
disable = ${toLuaObject cfg.indent.disable},
|
|
},
|
|
|
|
-- Highlight module for Treesitter
|
|
highlight = {
|
|
enable = ${toLuaObject cfg.highlight.enable},
|
|
disable = ${toLuaObject cfg.highlight.disable},
|
|
additional_vim_regex_highlighting = ${toLuaObject cfg.highlight.additionalVimRegexHighlighting},
|
|
},
|
|
|
|
-- Indentation module for Treesitter
|
|
-- Keymaps are set to false here as they are
|
|
-- handled by `vim.maps` entries calling lua
|
|
-- functions achieving the same functionality.
|
|
incremental_selection = {
|
|
enable = ${toLuaObject cfg.incrementalSelection.enable},
|
|
disable = ${toLuaObject cfg.incrementalSelection.disable},
|
|
keymaps = {
|
|
init_selection = false,
|
|
node_incremental = false,
|
|
scope_incremental = false,
|
|
node_decremental = false,
|
|
|
|
},
|
|
},
|
|
}
|
|
'';
|
|
};
|
|
};
|
|
}
|