diff --git a/lib/lua.nix b/lib/lua.nix index 9e67b3f..e871317 100644 --- a/lib/lua.nix +++ b/lib/lua.nix @@ -65,8 +65,6 @@ in rec { then if isLuaInline args then args.expr - else if hasAttr "__empty" args - then "{ }" else "{" + (concatStringsSep "," @@ -76,10 +74,7 @@ in rec { then toLuaObject v else "[${toLuaObject n}] = " + (toLuaObject v)) (filterAttrs - ( - _: v: - (v != null) && (toLuaObject v != "{}") - ) + (_: v: v != null) args))) + "}" else if isList args diff --git a/modules/wrapper/rc/config.nix b/modules/wrapper/rc/config.nix index b50531b..c278562 100644 --- a/modules/wrapper/rc/config.nix +++ b/modules/wrapper/rc/config.nix @@ -60,16 +60,11 @@ 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 config = filterAttrs (_: v: v != null) (getAttrs (attrNames mapConfigOptions) action); - in { - config = - if config == {} - then {"__empty" = null;} - else config; action = if action.lua then mkLuaInline action.action