raf/neovim-flake
1
0
Fork 0
mirror of https://github.com/NotAShelf/neovim-flake.git synced 2024-11-07 17:15:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge af72dc105d into f59a915da9

Browse source
This commit is contained in:
Ching Pei Yang 2024-05-18 21:51:38 +00:00 committed by GitHub
commit 5b98cb5000
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/lua.nix
View file

@ -65,8 +65,6 @@ in rec {
then then
if isLuaInline args if isLuaInline args
then args.expr then args.expr
else if hasAttr "__empty" args
then "{ }"
else else
"{" "{"
+ (concatStringsSep "," + (concatStringsSep ","
@ -76,10 +74,7 @@ in rec {
then toLuaObject v then toLuaObject v
else "[${toLuaObject n}] = " + (toLuaObject v)) else "[${toLuaObject n}] = " + (toLuaObject v))
(filterAttrs (filterAttrs
( (_: v: v != null)
_: v:
(v != null) && (toLuaObject v != "{}")
)
args))) args)))
+ "}" + "}"
else if isList args else if isList args

7
modules/wrapper/rc/config.nix
View file

@ -60,16 +60,11 @@
config = (attrs) the configuration options for this mapping (noremap, silent...) config = (attrs) the configuration options for this mapping (noremap, silent...)
} }
*/ */
normalizeAction = action: let normalizeAction = action: {
# Extract the values of the config options that have been explicitly set by the user # Extract the values of the config options that have been explicitly set by the user
config = config =
filterAttrs (_: v: v != null) filterAttrs (_: v: v != null)
(getAttrs (attrNames mapConfigOptions) action); (getAttrs (attrNames mapConfigOptions) action);
in {
config =
if config == {}
then {"__empty" = null;}
else config;
action = action =
if action.lua if action.lua
then mkLuaInline action.action then mkLuaInline action.action