Merge af72dc105d into 9074b6e5e7

Merge pull request #295 from NotAShelf/dependabot/github_actions/cachix/cachix-action-15
build(deps): bump cachix/cachix-action from 14 to 15
2024-05-21 06:06:44 -04:00 · 2024-05-21 07:36:16 +00:00 · 2024-05-20 19:43:05 +00:00 · 2024-05-18 14:52:40 +02:00 · 2024-05-12 03:17:04 +02:00
3 changed files with 3 additions and 13 deletions
--- a/.github/workflows/cachix.yml
+++ b/.github/workflows/cachix.yml
@ -37,7 +37,7 @@ jobs:
        uses: DeterminateSystems/nix-installer-action@main
      - uses: DeterminateSystems/magic-nix-cache-action@main

-      - uses: cachix/cachix-action@v14
+      - uses: cachix/cachix-action@v15
        with:
          authToken: ${{ secrets.CACHIX_TOKEN }}
          extraPullNames: nix-community
--- 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
--- 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
Author	SHA1	Message	Date
Ching Pei Yang	a379d3e155	Merge `af72dc105d` into `9074b6e5e7`	2024-05-21 06:06:44 -04:00
raf	9074b6e5e7	Merge pull request #295 from NotAShelf/dependabot/github_actions/cachix/cachix-action-15 build(deps): bump cachix/cachix-action from 14 to 15	2024-05-21 07:36:16 +00:00
dependabot[bot]	011f662fa0	--- updated-dependencies: - dependency-name: cachix/cachix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-05-20 19:43:05 +00:00
Ching Pei Yang	af72dc105d	lib: remove unused __empty special case in toLuaObject	2024-05-18 14:52:40 +02:00
Ching Pei Yang	8aa3a23e97	lib: do not filter out empty attrs in toLuaObject	2024-05-12 03:17:04 +02:00