diff --git a/lib/binds.nix b/lib/binds.nix index a8fbf5f0..8c9e9a62 100644 --- a/lib/binds.nix +++ b/lib/binds.nix @@ -4,68 +4,69 @@ inherit (lib.types) nullOr str; inherit (lib.attrsets) isAttrs mapAttrs; - 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; + binds = rec { + mkLuaBinding = key: action: desc: + mkIf (key != null) { + "${key}" = { + inherit action desc; + lua = true; + silent = true; }; - in - returnedValue) - actualMappings; + }; - mkSetBinding = mode: binding: action: - mkBinding mode binding.value action binding.description; + mkExprBinding = key: action: desc: + mkIf (key != null) { + "${key}" = { + inherit action desc; + lua = true; + silent = true; + expr = true; + }; + }; - mkSetExprBinding = mode: binding: action: - mkExprBinding mode binding.value action binding.description; + mkBinding = key: action: desc: + mkIf (key != null) { + "${key}" = { + inherit action desc; + silent = true; + }; + }; - mkSetLuaBinding = mode: binding: action: - mkLuaBinding mode binding.value action binding.description; + mkMappingOption = description: default: + mkOption { + type = nullOr str; + inherit default description; + }; - pushDownDefault = attr: mapAttrs (_: mkDefault) attr; -in { - inherit mkLuaBinding mkExprBinding mkBinding mkMappingOption addDescriptionsToMappings mkSetBinding mkSetExprBinding mkSetLuaBinding pushDownDefault; -} + # 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