mirror of
https://github.com/NotAShelf/nvf.git
synced 2024-11-22 21:30:51 +00: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>
85 lines
2.8 KiB
Nix
85 lines
2.8 KiB
Nix
{
|
|
config,
|
|
lib,
|
|
...
|
|
}: let
|
|
inherit (builtins) map mapAttrs filter;
|
|
inherit (lib.attrsets) mapAttrsToList;
|
|
inherit (lib.strings) concatLines concatMapStringsSep optionalString;
|
|
inherit (lib.trivial) showWarnings;
|
|
inherit (lib.generators) mkLuaInline;
|
|
inherit (lib.nvim.dag) entryAfter mkLuarcSection resolveDag entryAnywhere;
|
|
inherit (lib.nvim.lua) toLuaObject;
|
|
|
|
cfg = config.vim;
|
|
in {
|
|
config = let
|
|
globalsScript =
|
|
mapAttrsToList (name: value: "vim.g.${name} = ${toLuaObject value}") cfg.globals;
|
|
|
|
optionsScript =
|
|
mapAttrsToList (name: value: "vim.o.${name} = ${toLuaObject value}") cfg.options;
|
|
|
|
extraPluginConfigs = resolveDag {
|
|
name = "extra plugin configs";
|
|
dag = mapAttrs (_: value: entryAfter value.after value.setup) cfg.extraPlugins;
|
|
mapResult = result: concatLines (map mkLuarcSection result);
|
|
};
|
|
|
|
pluginConfigs = resolveDag {
|
|
name = "plugin configs";
|
|
dag = cfg.pluginRC;
|
|
mapResult = result: concatLines (map mkLuarcSection result);
|
|
};
|
|
|
|
getAction = keymap:
|
|
if keymap.lua
|
|
then mkLuaInline keymap.action
|
|
else keymap.action;
|
|
|
|
getOpts = keymap: {
|
|
inherit (keymap) desc silent nowait script expr unique noremap;
|
|
};
|
|
|
|
toLuaKeymap = bind: "vim.keymap.set(${toLuaObject bind.mode}, ${toLuaObject bind.key}, ${toLuaObject (getAction bind)}, ${toLuaObject (getOpts bind)})";
|
|
|
|
keymaps = concatLines (map toLuaKeymap cfg.keymaps);
|
|
in {
|
|
vim = {
|
|
luaConfigRC = {
|
|
# `vim.g` and `vim.o`
|
|
globalsScript = entryAnywhere (concatLines globalsScript);
|
|
optionsScript = entryAfter ["basic"] (concatLines optionsScript);
|
|
|
|
# Basic
|
|
lazyConfigs = entryAfter ["optionsScript"] cfg.lazy.builtLazyConfig;
|
|
pluginConfigs = entryAfter ["lazyConfigs"] pluginConfigs;
|
|
extraPluginConfigs = entryAfter ["pluginConfigs"] extraPluginConfigs;
|
|
mappings = entryAfter ["extraPluginConfigs"] keymaps;
|
|
};
|
|
|
|
builtLuaConfigRC = let
|
|
# Catch assertions and warnings
|
|
# and throw for each failed assertion. If no assertions are found, show warnings.
|
|
failedAssertions = map (x: x.message) (filter (x: !x.assertion) config.assertions);
|
|
baseSystemAssertWarn =
|
|
if failedAssertions != []
|
|
then throw "\nFailed assertions:\n${concatMapStringsSep "\n" (x: "- ${x}") failedAssertions}"
|
|
else showWarnings config.warnings;
|
|
|
|
luaConfig = resolveDag {
|
|
name = "lua config script";
|
|
dag = cfg.luaConfigRC;
|
|
mapResult = result:
|
|
concatLines [
|
|
cfg.luaConfigPre
|
|
(concatMapStringsSep "\n" mkLuarcSection result)
|
|
cfg.luaConfigPost
|
|
];
|
|
};
|
|
in
|
|
baseSystemAssertWarn luaConfig;
|
|
};
|
|
};
|
|
}
|