No commit message

aspects/nvim/files/.config/nvim/ftplugin/cpp.lua

@@ -6,15 +6,13 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    a = { "<CMD>ClangdAST<CR>", "Toggle AST" },
-    i = { "<CMD>ClangdToggleInlayHints<CR>", "Toggle Inlay Hints" },
-    s = { "<CMD>ClangdSwitchSourceHeader<CR>", "Switch Source Header" },
-    K = { "<CMD>ClangdSymbolInfo<CR>", "Symbol Info" },
-    h = { "<CMD>ClangdTypeHierarchy<CR>", "Type Hierarchy" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>La", "<CMD>ClangdAST<CR>", desc = "Toggle AST" },
+  { "<Leader>Li", "<CMD>ClangdToggleInlayHints<CR>", desc = "Toggle Inlay Hints" },
+  { "<Leader>Ls", "<CMD>ClangdSwitchSourceHeader<CR>", desc = "Switch Source Header" },
+  { "<Leader>LK", "<CMD>ClangdSymbolInfo<CR>", desc = "Symbol Info" },
+  { "<Leader>Lh", "<CMD>ClangdTypeHierarchy<CR>", desc = "Type Hierarchy" },
 }, options)
 
 local dap = require("dap")

aspects/nvim/files/.config/nvim/ftplugin/dart.lua

@@ -6,22 +6,20 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    p = { "<CMD>FlutterRun<CR>", "Run project" },
-    d = { "<CMD>FlutterDevices<CR>", "List connected devices" },
-    e = { "<CMD>FlutterEmulators<CR>", "List of emulators" },
-    q = { "<CMD>FlutterQuit<CR>", "End running session" },
-    D = { "<CMD>FlutterDetach<CR>", "End running session locally" },
-    o = { "<CMD>FlutterOutlineToggle<CR>", "Toggle outline window" },
-    t = { "<CMD>FlutterDevTools<CR>", "Start Dart Dev Tools server" },
-    a = { "<CMD>FlutterDevToolsActivate<CR>", "Start Dart Dev Tools server" },
-    P = { "<CMD>FlutterCopyProfilerUrl<CR>", "Copy profiler url to system clipboard" },
-    l = { "<CMD>FlutterLspRestart<CR>", "Restart LSP" },
-    s = { "<CMD>FlutterSuper<CR>", "Go to super class" },
-    r = { "<CMD>FlutterRename<CR>", "Rename and updates imports" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lp", "<CMD>FlutterRun<CR>", desc = "Run project" },
+  { "<Leader>Ld", "<CMD>FlutterDevices<CR>", desc = "List connected devices" },
+  { "<Leader>Le", "<CMD>FlutterEmulators<CR>", desc = "List of emulators" },
+  { "<Leader>Lq", "<CMD>FlutterQuit<CR>", desc = "End running session" },
+  { "<Leader>LD", "<CMD>FlutterDetach<CR>", desc = "End running session locally" },
+  { "<Leader>Lo", "<CMD>FlutterOutlineToggle<CR>", desc = "Toggle outline window" },
+  { "<Leader>Lt", "<CMD>FlutterDevTools<CR>", desc = "Start Dart Dev Tools server" },
+  { "<Leader>La", "<CMD>FlutterDevToolsActivate<CR>", desc = "Start Dart Dev Tools server" },
+  { "<Leader>LP", "<CMD>FlutterCopyProfilerUrl<CR>", desc = "Copy profiler url to system clipboard" },
+  { "<Leader>Ll", "<CMD>FlutterLspRestart<CR>", desc = "Restart LSP" },
+  { "<Leader>Ls", "<CMD>FlutterSuper<CR>", desc = "Go to super class" },
+  { "<Leader>Lr", "<CMD>FlutterRename<CR>", desc = "Rename and updates imports" },
 }, options)
 
 local dap = require("dap")

aspects/nvim/files/.config/nvim/ftplugin/go.lua

@@ -6,76 +6,65 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    o = { "<CMD>GoPkgOutline<CR>", "Package Outline" },
-    m = { "<CMD>GoMockGen<CR>", "Generate mocks for current file" },
-    I = { "<CMD>GoToggleInlay<CR>", "Toggle inlay hints" },
-    r = { "<CMD>GoGenReturn<CR>", "Create return value for current function" },
-    f = {
-      name = "Auto Fill",
-      s = { "<CMD>GoFillStruct<CR>", "Auto fill struct" },
-      w = { "<CMD>GoFillSwitch<CR>", "Fill switch" },
-      e = { "<CMD>GoIfErr<CR>", "Add if err" },
-      p = { "<CMD>GoFillPlurals<CR>", "change func foo(b int, a int, r int) -> func foo(b, a, r int)" },
-    },
-    i = {
-      name = "Install",
-      i = { "<CMD>GoInstallBinaries<CR>", "Install all tools, skip the ones installed" },
-      u = { "<CMD>GoUpdateBinaries<CR>", "Update all tools to the latest version" },
-    },
-    b = {
-      name = "Build",
-      m = { "<CMD>GoMake<CR>", "Make" },
-      g = { "<CMD>GoBuild<CR>", "Build" },
-      r = { "<CMD>GoGenerate<CR>", "Generate" },
-      s = { "<CMD>GoStop<CR>", "Stop job GoRun started" },
-    },
-    t = {
-      name = "Test",
-      t = { "<CMD>GoTest<CR>", "Test" },
-      w = { "<CMD>GoTestSum -w<CR>", "Test in watch mode" },
-      v = { "<CMD>GoTest -v<CR>", "Test -v current file path" },
-      c = { "<CMD>GoTest -c<CR>", "Test -c current file path" },
-      n = { "<CMD>GoTest -n<CR>", "Test nearest" },
-      f = { "<CMD>GoTest -f<CR>", "Test current file" },
-      p = { "<CMD>GoTest -p<CR>", "Test current package" },
-      v = { "<CMD>GoVet<CR>", "Vet" },
-      C = { "<CMD>GoCoverage<CR>", "Test cover profile" },
-      P = { "<CMD>GoCoverage -p<CR>", "Test package for current buffer" },
-    },
-    T = {
-      name = "Tags",
-      a = { "<CMD>GoAddTag<CR>", "Add tag" },
-      r = { "<CMD>GoRmTag<CR>", "Remove tag" },
-      c = { "<CMD>GoClearTag<CR>", "Clear tag" },
-    },
-    f = {
-      name = "Format",
-      f = { "<CMD>GoFmt<CR>", "Format" },
-      i = { "<CMD>GoImport<CR>", "Import" },
-    },
-    s = {
-      name = "Switch between go and test file",
-      a = { "<CMD>GoAlt!<CR>", "Alternate file" },
-      s = { "<CMD>GoAltS!<CR>", "Alternate file (horizontal split)" },
-      v = { "<CMD>GoAltv!<CR>", "Alternate file (vertical split)" },
-    },
-    m = {
-      name = "Mod",
-      i = { "<CMD>GoModInit<CR>", "Run go mod init" },
-      t = { "<CMD>GoModInit<CR>", "Run go mod tidy" },
-      v = { "<CMD>GoModInit<CR>", "Run go mod vendor" },
-    },
-    u = {
-      name = "Unit Tests",
-      f = { "<CMD><CR>", "Run tests for current function" },
-      F = { "<CMD><CR>", "Run tests for current file" },
-      s = { "<CMD><CR>", "Select test function" },
-      p = { "<CMD><CR>", "Run tests for package" },
-    },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lo", "<CMD>GoPkgOutline<CR>", desc = "Package Outline" },
+  { "<Leader>LM", "<CMD>GoMockGen<CR>", desc = "Generate mocks for current file" },
+  { "<Leader>LI", "<CMD>GoToggleInlay<CR>", desc = "Toggle inlay hints" },
+  { "<Leader>Lr", "<CMD>GoGenReturn<CR>", desc = "Create return value for current function" },
+
+  { "<Leader>LF", group = "Auto Fill" },
+  { "<Leader>LFs", "<CMD>GoFillStruct<CR>", desc = "Auto fill struct" },
+  { "<Leader>LFw", "<CMD>GoFillSwitch<CR>", desc = "Fill switch" },
+  { "<Leader>LFe", "<CMD>GoIfErr<CR>", desc = "Add if err" },
+  { "<Leader>LFp", "<CMD>GoFillPlurals<CR>", desc = "change func foo(b int, a int, r int) -> func foo(b, a, r int)" },
+
+  { "<Leader>Li", group = "Install" },
+  { "<Leader>Lii", "<CMD>GoInstallBinaries<CR>", desc = "Install all tools, skip the ones installed" },
+  { "<Leader>Liu", "<CMD>GoUpdateBinaries<CR>", desc = "Update all tools to the latest version" },
+
+  { "<Leader>Lb", group = "Build" },
+  { "<Leader>Lbm", "<CMD>GoMake<CR>", desc = "Make" },
+  { "<Leader>Lbg", "<CMD>GoBuild<CR>", desc = "Build" },
+  { "<Leader>Lbr", "<CMD>GoGenerate<CR>", desc = "Generate" },
+  { "<Leader>Lbs", "<CMD>GoStop<CR>", desc = "Stop job GoRun started" },
+
+  { "<Leader>Lt", group = "Test" },
+  { "<Leader>Ltt", "<CMD>GoTest<CR>", desc = "Test" },
+  { "<Leader>Ltw", "<CMD>GoTestSum -w<CR>", desc = "Test in watch mode" },
+  { "<Leader>Ltv", "<CMD>GoTest -v<CR>", desc = "Test -v current file path" },
+  { "<Leader>Ltc", "<CMD>GoTest -c<CR>", desc = "Test -c current file path" },
+  { "<Leader>Ltn", "<CMD>GoTest -n<CR>", desc = "Test nearest" },
+  { "<Leader>Ltf", "<CMD>GoTest -f<CR>", desc = "Test current file" },
+  { "<Leader>Ltp", "<CMD>GoTest -p<CR>", desc = "Test current package" },
+  { "<Leader>Ltv", "<CMD>GoVet<CR>", desc = "Vet" },
+  { "<Leader>LtC", "<CMD>GoCoverage<CR>", desc = "Test cover profile" },
+  { "<Leader>LtP", "<CMD>GoCoverage -p<CR>", desc = "Test package for current buffer" },
+
+  { "<Leader>LT", group = "Tags" },
+  { "<Leader>LTa", "<CMD>GoAddTag<CR>", desc = "Add tag" },
+  { "<Leader>LTr", "<CMD>GoRmTag<CR>", desc = "Remove tag" },
+  { "<Leader>LTc", "<CMD>GoClearTag<CR>", desc = "Clear tag" },
+
+  { "<Leader>Lf", group = "Format" },
+  { "<Leader>Lff", "<CMD>GoFmt<CR>", desc = "Format" },
+  { "<Leader>Lfi", "<CMD>GoImport<CR>", desc = "Import" },
+
+  { "<Leader>Ls", group = "Switch between go and test file" },
+  { "<Leader>Lsa", "<CMD>GoAlt!<CR>", desc = "Alternate file" },
+  { "<Leader>Lss", "<CMD>GoAltS!<CR>", desc = "Alternate file (horizontal split)" },
+  { "<Leader>Lsv", "<CMD>GoAltv!<CR>", desc = "Alternate file (vertical split)" },
+
+  { "<Leader>Lm", group = "Mod" },
+  { "<Leader>Lmi", "<CMD>GoModInit<CR>", desc = "Run go mod init" },
+  { "<Leader>Lmt", "<CMD>GoModInit<CR>", desc = "Run go mod tidy" },
+  { "<Leader>Lmv", "<CMD>GoModInit<CR>", desc = "Run go mod vendor" },
+
+  { "<Leader>Lu", group = "Unit Tests" },
+  { "<Leader>Luf", "<CMD><CR>", desc = "Run tests for current function" },
+  { "<Leader>LuF", "<CMD><CR>", desc = "Run tests for current file" },
+  { "<Leader>Lus", "<CMD><CR>", desc = "Select test function" },
+  { "<Leader>Lup", "<CMD><CR>", desc = "Run tests for package" },
 }, options)
 
 local dap = require("dap")

aspects/nvim/files/.config/nvim/ftplugin/java.lua

@@ -161,29 +161,25 @@ voptions = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, voptions)
 
-which_key.register({
-  ["L"] = {
-    name = "Lanage",
-    o = { "<cmd>lua require('jdtls').organize_imports()<cr>", "Organize Imports" },
-    v = { "<cmd>lua require('jdtls').extract_variable()<cr>", "Extract Variable" },
-    c = { "<cmd>lua require('jdtls').extract_constant()<cr>", "Extract Constant" },
-    m = { "<cmd>lua require('jdtls').extract_method()<cr>", "Extract Method" },
-    t = { "<cmd>lua require('jdtls').test_class()<cr>", "Test Class" },
-    n = { "<cmd>lua require('jdtls').test_nearest_method()<cr>", "Test Nearest Method" },
-    u = { "<CMD>JdtUpdateConfig<CR>", "Update Config" },
-    d = { "<CMD>JdtRefreshDebugConfigs<CR>", "Refresh debug config" },
-    e = { "<CMD>Jaq<CR>", "Execute Java" },
-    r = { "<CMD>JdtWipeDataAndRestart<CR>", "Wipe project data and Restart server" },
-    x = { "<CMD>JdtRestart<CR>", "Restart server" },
-    s = { "<CMD>JdtSetRuntime<CR>", "Set runtime" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lo", "<cmd>lua require('jdtls').organize_imports()<cr>", desc = "Organize Imports" },
+  { "<Leader>Lv", "<cmd>lua require('jdtls').extract_variable()<cr>", desc = "Extract Variable" },
+  { "<Leader>Lc", "<cmd>lua require('jdtls').extract_constant()<cr>", desc = "Extract Constant" },
+  { "<Leader>Lm", "<cmd>lua require('jdtls').extract_method()<cr>", desc = "Extract Method" },
+  { "<Leader>Lt", "<cmd>lua require('jdtls').test_class()<cr>", desc = "Test Class" },
+  { "<Leader>Ln", "<cmd>lua require('jdtls').test_nearest_method()<cr>", desc = "Test Nearest Method" },
+  { "<Leader>Lu", "<CMD>JdtUpdateConfig<CR>", desc = "Update Config" },
+  { "<Leader>Ld", "<CMD>JdtRefreshDebugConfigs<CR>", desc = "Refresh debug config" },
+  { "<Leader>Le", "<CMD>Jaq<CR>", desc = "Execute Java" },
+  { "<Leader>Lr", "<CMD>JdtWipeDataAndRestart<CR>", desc = "Wipe project data and Restart server" },
+  { "<Leader>Lx", "<CMD>JdtRestart<CR>", desc = "Restart server" },
+  { "<Leader>Ls", "<CMD>JdtSetRuntime<CR>", desc = "Set runtime" },
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    v = { "<cmd>lua require('jdtls').extract_variable(true)<cr>", "Extract Variable" },
-    c = { "<cmd>lua require('jdtls').extract_constant(true)<cr>", "Extract Constant" },
-    m = { "<cmd>lua require('jdtls').extract_method(true)<cr>", "Extract Method" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lv", "<cmd>lua require('jdtls').extract_variable(true)<cr>", desc = "Extract Variable" },
+  { "<Leader>Lc", "<cmd>lua require('jdtls').extract_constant(true)<cr>", desc = "Extract Constant" },
+  { "<Leader>Lm", "<cmd>lua require('jdtls').extract_method(true)<cr>", desc = "Extract Method" },
 }, voptions)

aspects/nvim/files/.config/nvim/ftplugin/mail.lua

@@ -17,14 +17,12 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    f = { "1G0f:C: ", "From" },
-    t = { "2G0f:C: ", "To" },
-    c = { "3G0f:C: ", "CC" },
-    b = { "4G0f:C: ", "BCC" },
-    s = { "5G0f:C: ", "Subject" },
-    r = { "6G0f:C: ", "Reply To" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lf", "1G0f:C: ", desc = "From" },
+  { "<Leader>Lt", "2G0f:C: ", desc = "To" },
+  { "<Leader>Lc", "3G0f:C: ", desc = "CC" },
+  { "<Leader>Lb", "4G0f:C: ", desc = "BCC" },
+  { "<Leader>Ls", "5G0f:C: ", desc = "Subject" },
+  { "<Leader>Lr", "6G0f:C: ", desc = "Reply To" },
 }, options)

aspects/nvim/files/.config/nvim/ftplugin/markdown.lua

@@ -7,31 +7,25 @@ options = vim.tbl_deep_extend("force", {
   buffer = buffer,
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    g = { "<cmd>Glow<CR>", "Toggle Glow" },
-    p = { "<cmd>MarkdownPreviewToggle<CR>", "Toggle Markdown Preview" },
-    t = {
-      name = "Table",
-      t = { "<cmd>TableModeToggle<CR>", "Enable/Disable Table Mode" },
-      n = { "<Leader>ti", "Get cell info" },
-      f = {
-        name = "Formula",
-        a = { "<cmd>TableAddFormula<CR>", "Add formula" },
-        e = { "<Leader>tfe", "Evaluate formula on current row" },
-      },
-      d = {
-        name = "Delete",
-        r = { "<Leader>tdr", "Delete row" },
-        c = { "<Leader>tdc", "Delete column" },
-      },
-      i = {
-        name = "Insert",
-        c = { "<Leader>tic", "Insert column" },
-      },
-    },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lg", "<CMD>Glow<CR>", desc = "Toggle Glow" },
+  { "<Leader>Lp", "<CMD>MarkdownPreviewToggle<CR>", desc = "Toggle Markdown Preview" },
+
+  { "<Leader>Lt", group = "Table" },
+  { "<Leader>Ltt", "<CMD>TableModeToggle<CR>", desc = "Enable/Disable Table Mode" },
+  { "<Leader>Ltn", "<Leader>ti", desc = "Get cell info" },
+
+  { "<Leader>Lf", group = "Formula" },
+  { "<Leader>Lfa", "<CMD>TableAddFormula<CR>", desc = "Add formula" },
+  { "<Leader>Lfe", "<Leader>tfe", desc = "Evaluate formula on current row" },
+
+  { "<Leader>Ld", group = "Delete" },
+  { "<Leader>Ldr", "<Leader>tdr", desc = "Delete row" },
+  { "<Leader>Ldc", "<Leader>tdc", desc = "Delete column" },
+
+  { "<Leader>Li", group = "Insert" },
+  { "<Leader>Lic", "<Leader>tic", desc = "Insert column" },
 }, options)
 
 vim.keymap.set(

aspects/nvim/files/.config/nvim/ftplugin/python.lua

@@ -7,27 +7,20 @@ options = vim.tbl_deep_extend("force", {
   buffer = vim.api.nvim_get_current_buf(),
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    j = {
-      name = "Jupyter",
-      l = { "<Cmd>MoltenLoad<CR>", "Load Molten" },
-      i = { "<Cmd>MoltenInit<CR>", "Init Molten" },
-      I = { "<Cmd>MoltenInfo<CR>", "Info Molten" },
-      e = { "<Cmd>MoltenEvaluateLine<CR>", "Evaluate Line Molten" },
-      r = { "<Cmd>MoltenReevaluateCell<CR>", "Reevaluate Cell Molten" },
-    },
-    p = { "<Cmd>PyrightOrganizeImports<CR>", "Organize Imports" },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lp", "<Cmd>PyrightOrganizeImports<CR>", desc = "Organize Imports" },
+
+  { "<Leader>Lj", group = "Jupyter" },
+  { "<Leader>Ljl", "<Cmd>MoltenLoad<CR>", desc = "Load Molten" },
+  { "<Leader>Lji", "<Cmd>MoltenInit<CR>", desc = "Init Molten" },
+  { "<Leader>LjI", "<Cmd>MoltenInfo<CR>", desc = "Info Molten" },
+  { "<Leader>Lje", "<Cmd>MoltenEvaluateLine<CR>", desc = "Evaluate Line Molten" },
+  { "<Leader>Ljr", "<Cmd>MoltenReevaluateCell<CR>", desc = "Reevaluate Cell Molten" },
 }, options)
 
-which_key.register({
-  ["L"] = {
-    name = "Language",
-    j = {
-      name = "Jupyter",
-      e = { "<Esc><Cmd>MoltenEvaluateVisual<cr>", "Evaluate Highlighted Line" },
-    },
-  },
+which_key.add({
+  { "<Leader>L", group = "Language" },
+  { "<Leader>Lj", group = "Jupyter" },
+  { "<Leader>Lje", "<Esc><Cmd>MoltenEvaluateVisual<cr>", desc = "Evaluate Highlighted Line" },
 }, voptions)