mirror of
https://github.com/NotAShelf/neovim-flake.git
synced 2024-12-22 16:39:47 +01:00
21fcace3ed
* flake: add lz.n and lzn-auto-require * lazy: init module * lzn-auto-require: add init lua code * wrapper: fix opt plugin format * lib.binds: add lz.n variant of bind functions * telescope: lazy load * nvim-tree: lazy load * dapui: lazy load * trouble: lazy load * toggleterm: lazy load * cheatsheet: lazy load * diffview: lazy load * icon-picker: lazy load * leap: lazy load * fidget: lazy load * docs: add section on lazy plugins * lazy: support lazy.enable=false * comment-nvim: lazy load * surround-nvim: lazy load * neo-tree: lazy load * fixup! lazy: init module * dap: appease the nix gods (fix statix lint) * flake.lock: fix merge mistake * doc: update release note * fixup! doc: update release note * neo-tree: fix duplicate neo-tree install * lazy: use attrsOf for lazy.plugins * treewide: update lazy.plugins syntax * docs: update lazy.plugins syntax * lazy: cleanup * Update docs/manual/hacking/additional-plugins.md Co-authored-by: diniamo <55629891+diniamo@users.noreply.github.com> * formatting nitpick Co-authored-by: diniamo <55629891+diniamo@users.noreply.github.com> * typo tee hee :3 Co-authored-by: diniamo <55629891+diniamo@users.noreply.github.com> * typo tee hee :4 Co-authored-by: diniamo <55629891+diniamo@users.noreply.github.com> * flake: update lz.n * lazy: update lz.n plugin spec * lazy: allow lines in place of str for lua code * copilot: lazy load * cmp: lazy load this moves cmp itself to lazy.plugins but other plugins that call cmp are not yet lazy so cmp is technically not yet lazy * luasnip: lazy load * flake: add rtp.nvim * cmp: actually lazy load source * fixup! cmp: actually lazy load source * format * docs: fix broken link * cmp-nvim-lsp: lazy load * lazy: allow key mode of str type * cmp: install sourcess via cmp.sourcePlugins * Update docs/manual/hacking/additional-plugins.md Co-authored-by: diniamo <55629891+diniamo@users.noreply.github.com> * lazy: refactor common var * nvim-dap-ui: add setupOpts * refactor: re-order plugin and lz.n configs lazy: make lzn-auto-require togglable * docs: update dag-entries * trouble: remove redundant import * lazy: remove unused module arg * toggleterm: make lazygit keybind optional * toggleterm: use toLuaObject for clarity * surround: rework keymap config * remove stale FIXME * lsp: use cmp_nvim_lsp capabilities * cmp: deduplicate attr key * theme: ensure themes load before lazy plugins * doc: update description of `theme` dag entry * lsp: avoid loading cmp on startup * doc: update configuration docs on custom plugins * cmp: skip trigger_load if lazy disabled * treesitter: remove redundant code * lsp: mark hack as HACK * comment: remove redundant plugin * Squash merge v0.7 into feature/lzn --------- Co-authored-by: raf <raf@notashelf.dev> Co-authored-by: diniamo <55629891+diniamo@users.noreply.github.com>
95 lines
3.7 KiB
Nix
95 lines
3.7 KiB
Nix
{
|
|
config,
|
|
pkgs,
|
|
lib,
|
|
...
|
|
}: let
|
|
inherit (lib.modules) mkIf mkMerge;
|
|
inherit (lib.lists) optionals;
|
|
inherit (lib.nvim.binds) mkSetBinding addDescriptionsToMappings;
|
|
inherit (lib.nvim.lua) toLuaObject;
|
|
inherit (lib.nvim.dag) entryBefore entryAfter;
|
|
|
|
cfg = config.vim.treesitter;
|
|
|
|
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"];
|
|
|
|
autocomplete.nvim-cmp = {
|
|
sources = {treesitter = "[Treesitter]";};
|
|
sourcePlugins = ["cmp-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,
|
|
|
|
},
|
|
},
|
|
}
|
|
'';
|
|
};
|
|
};
|
|
}
|