mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lib: cleanup with lib

Browse source
This commit is contained in:
Austin Horstman 2024-08-30 14:49:20 -05:00
parent c76e5070b9
commit 35788bbc5a
No known key found for this signature in database
9 changed files with 179 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/keymap-helpers.nix
View file

@ -1,5 +1,7 @@
{ lib, helpers }:
with lib;
let
inherit (lib) optionalAttrs isAttrs types;
in
rec {
# These are the configuration options that change the behavior of each mapping.
mapConfigOptions = {
@ -17,7 +19,7 @@ rec {
remap = helpers.defaultNullOpts.mkBool false "Make the mapping recursive. Inverses `noremap`.";
desc = helpers.mkNullOrOption types.str "A textual description of this keybind, to be shown in which-key, if you have it.";
desc = helpers.mkNullOrOption lib.types.str "A textual description of this keybind, to be shown in which-key, if you have it.";
buffer = helpers.defaultNullOpts.mkBool false "Make the mapping buffer-local. Equivalent to adding `<buffer>` to a map.";
};
@ -52,9 +54,9 @@ rec {
};
modeEnum =
types.enum
lib.types.enum
# ["" "n" "v" ...]
(map ({ short, ... }: short) (attrValues modes));
(map ({ short, ... }: short) (lib.attrValues modes));
mapOptionSubmodule = mkMapOptionSubmodule { };
@ -66,8 +68,8 @@ rec {
mkModeOption =
default:
mkOption {
type = with types; either modeEnum (listOf modeEnum);
lib.mkOption {
type = with lib.types; either modeEnum (listOf modeEnum);
description = ''
One or several modes.
Use the short-names (`"n"`, `"v"`, ...).
@ -96,17 +98,16 @@ rec {
extraOptions ? { },
extraModules ? [ ],
}:
with types;
submodule (
types.submodule (
{ config, options, ... }:
{
imports = extraModules;
options =
(optionalAttrs (isAttrs key || key) {
key = mkOption (
(lib.optionalAttrs (isAttrs key || key) {
key = lib.mkOption (
{
type = str;
type = types.str;
description = "The key to map.";
example = "<C-m>";
}
@ -115,9 +116,9 @@ rec {
);
})
// (optionalAttrs (isAttrs action || action) {
action = mkOption (
action = lib.mkOption (
{
type = maybeRaw str;
type = types.maybeRaw types.str;
description = "The action to execute.";
apply = v: if options.lua.isDefined or false && config.lua then helpers.mkRaw v else v;
}
@ -126,9 +127,9 @@ rec {
);
})
// optionalAttrs (isAttrs lua || lua) {
lua = mkOption (
lua = lib.mkOption (
{
type = bool;
type = types.bool;
description = ''
If true, `action` is considered to be lua code.
Thus, it will not be wrapped in `""`.