Merge branch 'main' into v0.7

This commit is contained in:
raf 2024-08-12 00:10:03 +00:00 committed by GitHub
commit 3ca7e3b841
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 67 additions and 78 deletions

View file

@ -3,10 +3,10 @@
lib,
...
}: let
inherit (builtins) map mapAttrs filter attrsToList;
inherit (lib.attrsets) filterAttrs;
inherit (builtins) map mapAttrs filter;
inherit (lib.options) mkOption;
inherit (lib.attrsets) mapAttrsToList filterAttrs getAttrs attrValues attrNames;
inherit (lib.strings) concatLines concatMapStringsSep;
inherit (lib.misc) mapAttrsFlatten;
inherit (lib.trivial) showWarnings;
inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.dag) entryAfter mkLuarcSection resolveDag entryAnywhere;
@ -17,7 +17,7 @@ in {
config = let
filterNonNull = filterAttrs (_: value: value != null);
globalsScript =
mapAttrsFlatten (name: value: "vim.g.${name} = ${toLuaObject value}")
mapAttrsToList (name: value: "vim.g.${name} = ${toLuaObject value}")
(filterNonNull cfg.globals);
extraPluginConfigs = resolveDag {