Merge pull request #1450 from alfarelcynthesis/no-default-mappings-option

treewide: allow disabling nvf mappings
This commit is contained in:
Alfarel 2026-04-10 13:04:12 -04:00 committed by GitHub
commit 3ab2d5d876
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
52 changed files with 489 additions and 622 deletions

View file

@ -1,6 +1,10 @@
{lib, ...}: let
{
config,
lib,
...
}: let
inherit (lib.options) mkEnableOption;
inherit (lib.nvim.binds) mkMappingOption;
inherit (config.vim.lib) mkMappingOption;
in {
options.vim.lsp = {
formatOnSave = mkEnableOption "format on save";
@ -10,66 +14,26 @@ in {
};
mappings = {
goToDefinition =
mkMappingOption "Go to definition"
"<leader>lgd";
goToDeclaration =
mkMappingOption "Go to declaration"
"<leader>lgD";
goToType =
mkMappingOption "Go to type"
"<leader>lgt";
listImplementations =
mkMappingOption "List implementations"
"<leader>lgi";
listReferences =
mkMappingOption "List references"
"<leader>lgr";
nextDiagnostic =
mkMappingOption "Go to next diagnostic"
"<leader>lgn";
previousDiagnostic =
mkMappingOption "Go to previous diagnostic"
"<leader>lgp";
openDiagnosticFloat =
mkMappingOption "Open diagnostic float"
"<leader>le";
documentHighlight =
mkMappingOption "Document highlight"
"<leader>lH";
listDocumentSymbols =
mkMappingOption "List document symbols"
"<leader>lS";
addWorkspaceFolder =
mkMappingOption "Add workspace folder"
"<leader>lwa";
removeWorkspaceFolder =
mkMappingOption "Remove workspace folder"
"<leader>lwr";
listWorkspaceFolders =
mkMappingOption "List workspace folders"
"<leader>lwl";
listWorkspaceSymbols =
mkMappingOption "List workspace symbols"
"<leader>lws";
hover =
mkMappingOption "Trigger hover"
"<leader>lh";
signatureHelp =
mkMappingOption "Signature help"
"<leader>ls";
renameSymbol =
mkMappingOption "Rename symbol"
"<leader>ln";
codeAction =
mkMappingOption "Code action"
"<leader>la";
format =
mkMappingOption "Format"
"<leader>lf";
toggleFormatOnSave =
mkMappingOption "Toggle format on save"
"<leader>ltf";
goToDefinition = mkMappingOption "Go to definition" "<leader>lgd";
goToDeclaration = mkMappingOption "Go to declaration" "<leader>lgD";
goToType = mkMappingOption "Go to type" "<leader>lgt";
listImplementations = mkMappingOption "List implementations" "<leader>lgi";
listReferences = mkMappingOption "List references" "<leader>lgr";
nextDiagnostic = mkMappingOption "Go to next diagnostic" "<leader>lgn";
previousDiagnostic = mkMappingOption "Go to previous diagnostic" "<leader>lgp";
openDiagnosticFloat = mkMappingOption "Open diagnostic float" "<leader>le";
documentHighlight = mkMappingOption "Document highlight" "<leader>lH";
listDocumentSymbols = mkMappingOption "List document symbols" "<leader>lS";
addWorkspaceFolder = mkMappingOption "Add workspace folder" "<leader>lwa";
removeWorkspaceFolder = mkMappingOption "Remove workspace folder" "<leader>lwr";
listWorkspaceFolders = mkMappingOption "List workspace folders" "<leader>lwl";
listWorkspaceSymbols = mkMappingOption "List workspace symbols" "<leader>lws";
hover = mkMappingOption "Trigger hover" "<leader>lh";
signatureHelp = mkMappingOption "Signature help" "<leader>ls";
renameSymbol = mkMappingOption "Rename symbol" "<leader>ln";
codeAction = mkMappingOption "Code action" "<leader>la";
format = mkMappingOption "Format" "<leader>lf";
toggleFormatOnSave = mkMappingOption "Toggle format on save" "<leader>ltf";
};
};
}

View file

@ -1,9 +1,13 @@
{lib, ...}: let
{
config,
lib,
...
}: let
inherit (lib.options) mkEnableOption mkOption;
inherit (lib.nvim.binds) mkMappingOption;
inherit (lib.nvim.types) mkPluginSetupOption;
inherit (lib.types) enum int;
inherit (lib.modules) mkRenamedOptionModule;
inherit (config.vim.lib) mkMappingOption;
in {
imports = let
renamedSetupOption = oldPath: newPath:

View file

@ -1,8 +1,12 @@
{lib, ...}: let
{
config,
lib,
...
}: let
inherit (lib.options) mkOption mkEnableOption;
inherit (lib.nvim.binds) mkMappingOption;
inherit (lib.types) bool str listOf;
inherit (lib.nvim.types) mkPluginSetupOption;
inherit (config.vim.lib) mkMappingOption;
in {
options.vim.lsp = {
otter-nvim = {

View file

@ -1,7 +1,11 @@
{lib, ...}: let
{
config,
lib,
...
}: let
inherit (lib.options) mkEnableOption;
inherit (lib.nvim.binds) mkMappingOption;
inherit (lib.nvim.types) mkPluginSetupOption;
inherit (config.vim.lib) mkMappingOption;
in {
options.vim.lsp = {
trouble = {