raf/neovim-flake
1
0
Fork 0
mirror of https://github.com/NotAShelf/neovim-flake.git synced 2024-12-19 08:39:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

lib/binds: improve code, adjust functions to new api

Browse source
This commit is contained in:
diniamo 2024-08-10 15:06:06 +02:00
parent 75cb9bced7
commit 6cb57e1d26
1 changed files with 60 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lib/binds.nix
View file

@ -4,30 +4,29 @@
inherit (lib.types) nullOr str; inherit (lib.types) nullOr str;
inherit (lib.attrsets) isAttrs mapAttrs; inherit (lib.attrsets) isAttrs mapAttrs;
binds = rec { mkLuaBinding = mode: key: action: desc:
mkLuaBinding = key: action: desc:
mkIf (key != null) { mkIf (key != null) {
"${key}" = { ${key} = {
inherit action desc; inherit mode action desc;
lua = true; lua = true;
silent = true; silent = true;
}; };
}; };
mkExprBinding = key: action: desc: mkExprBinding = mode: key: action: desc:
mkIf (key != null) { mkIf (key != null) {
"${key}" = { ${key} = {
inherit action desc; inherit mode action desc;
lua = true; lua = true;
silent = true; silent = true;
expr = true; expr = true;
}; };
}; };
mkBinding = key: action: desc: mkBinding = mode: key: action: desc:
mkIf (key != null) { mkIf (key != null) {
"${key}" = { ${key} = {
inherit action desc; inherit mode action desc;
silent = true; silent = true;
}; };
}; };
@ -48,25 +47,25 @@
isNested = isAttrs value; isNested = isAttrs value;
returnedValue = returnedValue =
if isNested if isNested
then addDescriptionsToMappings actualMappings."${name}" mappingDefinitions."${name}" then addDescriptionsToMappings actualMappings.${name} mappingDefinitions.${name}
else { else {
inherit value; inherit value;
inherit (mappingDefinitions."${name}") description; inherit (mappingDefinitions.${name}) description;
}; };
in in
returnedValue) returnedValue)
actualMappings; actualMappings;
mkSetBinding = binding: action: mkSetBinding = mode: binding: action:
mkBinding binding.value action binding.description; mkBinding mode binding.value action binding.description;
mkSetExprBinding = binding: action: mkSetExprBinding = mode: binding: action:
mkExprBinding binding.value action binding.description; mkExprBinding mode binding.value action binding.description;
mkSetLuaBinding = binding: action: mkSetLuaBinding = mode: binding: action:
mkLuaBinding binding.value action binding.description; mkLuaBinding mode binding.value action binding.description;
pushDownDefault = attr: mapAttrs (_: mkDefault) attr; pushDownDefault = attr: mapAttrs (_: mkDefault) attr;
}; in {
in inherit mkLuaBinding mkExprBinding mkBinding mkMappingOption addDescriptionsToMappings mkSetBinding mkSetExprBinding mkSetLuaBinding pushDownDefault;
binds }