mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-07-14 11:14:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

modules: cleanup with lib

Browse source
This commit is contained in:
Austin Horstman 2024-08-30 14:37:41 -05:00
parent ff042dfc93
commit 1c9ba58aef
No known key found for this signature in database
12 changed files with 79 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/keymaps.nix
View file

@ -5,11 +5,10 @@
options,
...
}:
with lib;
{
options = {
keymaps = mkOption {
type = types.listOf helpers.keymaps.deprecatedMapOptionSubmodule;
keymaps = lib.mkOption {
type = lib.types.listOf helpers.keymaps.deprecatedMapOptionSubmodule;
default = [ ];
description = "Nixvim keymaps.";
example = [
@ -21,8 +20,8 @@ with lib;
];
};
keymapsOnEvents = mkOption {
type = types.attrsOf (types.listOf helpers.keymaps.deprecatedMapOptionSubmodule);
keymapsOnEvents = lib.mkOption {
type = lib.types.attrsOf (lib.types.listOf helpers.keymaps.deprecatedMapOptionSubmodule);
default = { };
example = {
"InsertEnter" = [
@ -67,7 +66,7 @@ with lib;
in
lib.pipe keymapOptions [
(map (opt: (opt.type.getSubOptions opt.loc).lua))
(filter (opt: opt.isDefined))
(lib.filter (opt: opt.isDefined))
(map (opt: ''
${"\n"}
The `${lib.showOption opt.loc}' option is deprecated and will be removed in 24.11.
@ -79,7 +78,7 @@ with lib;
''))
];
extraConfigLua = mkIf (config.keymaps != [ ]) ''
extraConfigLua = lib.mkIf (config.keymaps != [ ]) ''
-- Set up keybinds {{{
do
local __nixvim_binds = ${helpers.toLuaObject (map helpers.keymaps.removeDeprecatedMapAttrs config.keymaps)}
@ -90,11 +89,11 @@ with lib;
-- }}}
'';
autoGroups = mapAttrs' (
event: mappings: nameValuePair "nixvim_binds_${event}" { clear = true; }
autoGroups = lib.mapAttrs' (
event: mappings: lib.nameValuePair "nixvim_binds_${event}" { clear = true; }
) config.keymapsOnEvents;
autoCmd = mapAttrsToList (event: mappings: {
autoCmd = lib.mapAttrsToList (event: mappings: {
inherit event;
group = "nixvim_binds_${event}";
callback = helpers.mkRaw ''