From 6cb57e1d266e8d1f40bc5af1e691a65d320f8a35 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Sat, 10 Aug 2024 15:06:06 +0200
Subject: [PATCH] lib/binds: improve code, adjust functions to new api

---
 lib/binds.nix | 121 +++++++++++++++++++++++++-------------------------
 1 file changed, 60 insertions(+), 61 deletions(-)

diff --git a/lib/binds.nix b/lib/binds.nix
index 8c9e9a6..a8fbf5f 100644
--- a/lib/binds.nix
+++ b/lib/binds.nix
@@ -4,69 +4,68 @@
   inherit (lib.types) nullOr str;
   inherit (lib.attrsets) isAttrs mapAttrs;
 
-  binds = rec {
-    mkLuaBinding = key: action: desc:
-      mkIf (key != null) {
-        "${key}" = {
-          inherit action desc;
-          lua = true;
-          silent = true;
+  mkLuaBinding = mode: key: action: desc:
+    mkIf (key != null) {
+      ${key} = {
+        inherit mode action desc;
+        lua = true;
+        silent = true;
+      };
+    };
+
+  mkExprBinding = mode: key: action: desc:
+    mkIf (key != null) {
+      ${key} = {
+        inherit mode action desc;
+        lua = true;
+        silent = true;
+        expr = true;
+      };
+    };
+
+  mkBinding = mode: key: action: desc:
+    mkIf (key != null) {
+      ${key} = {
+        inherit mode action desc;
+        silent = true;
+      };
+    };
+
+  mkMappingOption = description: default:
+    mkOption {
+      type = nullOr str;
+      inherit default description;
+    };
+
+  # Utility function that takes two attrsets:
+  # { someKey = "some_value" } and
+  # { someKey = { description = "Some Description"; }; }
+  # and merges them into
+  # { someKey = { value = "some_value"; description = "Some Description"; }; }
+  addDescriptionsToMappings = actualMappings: mappingDefinitions:
+    mapAttrs (name: value: let
+      isNested = isAttrs value;
+      returnedValue =
+        if isNested
+        then addDescriptionsToMappings actualMappings.${name} mappingDefinitions.${name}
+        else {
+          inherit value;
+          inherit (mappingDefinitions.${name}) description;
         };
-      };
+    in
+      returnedValue)
+    actualMappings;
 
-    mkExprBinding = key: action: desc:
-      mkIf (key != null) {
-        "${key}" = {
-          inherit action desc;
-          lua = true;
-          silent = true;
-          expr = true;
-        };
-      };
+  mkSetBinding = mode: binding: action:
+    mkBinding mode binding.value action binding.description;
 
-    mkBinding = key: action: desc:
-      mkIf (key != null) {
-        "${key}" = {
-          inherit action desc;
-          silent = true;
-        };
-      };
+  mkSetExprBinding = mode: binding: action:
+    mkExprBinding mode binding.value action binding.description;
 
-    mkMappingOption = description: default:
-      mkOption {
-        type = nullOr str;
-        inherit default description;
-      };
+  mkSetLuaBinding = mode: binding: action:
+    mkLuaBinding mode binding.value action binding.description;
 
-    # Utility function that takes two attrsets:
-    # { someKey = "some_value" } and
-    # { someKey = { description = "Some Description"; }; }
-    # and merges them into
-    # { someKey = { value = "some_value"; description = "Some Description"; }; }
-    addDescriptionsToMappings = actualMappings: mappingDefinitions:
-      mapAttrs (name: value: let
-        isNested = isAttrs value;
-        returnedValue =
-          if isNested
-          then addDescriptionsToMappings actualMappings."${name}" mappingDefinitions."${name}"
-          else {
-            inherit value;
-            inherit (mappingDefinitions."${name}") description;
-          };
-      in
-        returnedValue)
-      actualMappings;
-
-    mkSetBinding = binding: action:
-      mkBinding binding.value action binding.description;
-
-    mkSetExprBinding = binding: action:
-      mkExprBinding binding.value action binding.description;
-
-    mkSetLuaBinding = binding: action:
-      mkLuaBinding binding.value action binding.description;
-
-    pushDownDefault = attr: mapAttrs (_: mkDefault) attr;
-  };
-in
-  binds
+  pushDownDefault = attr: mapAttrs (_: mkDefault) attr;
+in {
+  inherit mkLuaBinding mkExprBinding mkBinding mkMappingOption addDescriptionsToMappings mkSetBinding mkSetExprBinding mkSetLuaBinding pushDownDefault;
+}