mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

treesitter: fix it properly!

Browse source
This commit is contained in:
Pedro Alves 2021-02-01 16:40:07 +00:00
parent 0a380bc90d
commit ea1a5a1a10
2 changed files with 21 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -54,6 +54,8 @@
enable = true;
servers.clangd.enable = true;
};
plugins.treesitter.enable = true;
};
})
];

41
plugins/languages/treesitter.nix
View file

@ -30,19 +30,16 @@ in
incrementalSelection = let
keymap = default: mkOption {
type = types.str;
default = default;
inherit default;
};
in {
enable = mkEnableOption "Incremental selection based on the named nodes from the grammar";
keymaps = {
initSelection = keymap "gnn";
nodeIncremental = keymap "grn";
scopeIncremental = keymap "grc";
nodeDecremental = keymap "grm";
};
in mkOption {
type = types.nullOr (types.submodule {
enable = mkEnableOption "Incremental selection based on the named nodes from the grammar";
keymaps = {
initSelection = keymap "gnn";
nodeIncremental = keymap "grn";
scopeIncremental = keymap "grc";
nodeDecremental = keymap "grm";
};
});
default = null;
};
indent = mkEnableOption "Enable tree-sitter based indentation";
@ -60,17 +57,17 @@ in
custom_captures = mkIf (cfg.customCaptures != {}) cfg.customCaptures;
};
incremental_selection = mkIf cfg.incrementalSelection.enable {
enable = true;
keymaps = {
init_selection = cfg.incrementalSelection.keymaps.initSelection;
node_incremental = cfg.incrementalSelection.keymaps.nodeIncremental;
scope_incremental = cfg.incrementalSelection.keymaps.scopeIncremental;
node_decremental = cfg.incrementalSelection.keymaps.nodeDecremental;
};
};
# incremental_selection = mkIf cfg.incrementalSelection.enable {
# enable = true;
# keymaps = {
# init_selection = cfg.incrementalSelection.keymaps.initSelection;
# node_incremental = cfg.incrementalSelection.keymaps.nodeIncremental;
# scope_incremental = cfg.incrementalSelection.keymaps.scopeIncremental;
# node_decremental = cfg.incrementalSelection.keymaps.nodeDecremental;
# };
# };
indent = mkIf cfg.indent.enable {
indent = mkIf cfg.indent {
enable = true;
};