set up whichkey group names

gvolpe · Mar 31, 2024 · b87a2e5 · b87a2e5
1 parent 16cb3c7
commit b87a2e5
Show file tree

Hide file tree

Showing 10 changed files with 112 additions and 27 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/comments/default.nix b/modules/comments/default.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.vim.comments;
+  keys = config.vim.keys.whichKey;
 in
 {
   options.vim.comments = {
@@ -32,6 +33,14 @@ in
         })
         ''
       }
+
+      ${writeIf keys.enable ''
+        wk.register({
+          ["<leader>c"] = {
+            name = "Commenter",
+          },
+        })
+      ''}
     '';
   };
 }
diff --git a/modules/filetree/nvimtreelua.nix b/modules/filetree/nvimtreelua.nix
@@ -5,6 +5,7 @@ with builtins;
 
 let
   cfg = config.vim.filetree.nvimTreeLua;
+  keys = config.vim.keys.whichKey;
 in
 {
   options.vim.filetree.nvimTreeLua = {
@@ -181,6 +182,14 @@ in
 
         vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
       ''}
+
+      ${writeIf keys.enable ''
+        wk.register({
+          ["<leader>t"] = {
+            name = "Tree & Todo",
+          },
+        })
+      ''}
     '';
   };
 }
diff --git a/modules/git/git.nix b/modules/git/git.nix
@@ -5,6 +5,7 @@ with builtins;
 
 let
   cfg = config.vim.git;
+  keys = config.vim.keys.whichKey;
 in
 {
   options.vim.git = {
@@ -38,32 +39,46 @@ in
             end
 
             -- Navigation
-            map('n', '<leader>gn', function()
+            local function nextHunk()
               if vim.wo.diff then return ']c' end
               vim.schedule(function() gs.next_hunk() end)
               return '<Ignore>'
-            end, {expr=true})
+            end
 
-            map('n', '<leader>gp', function()
+            local function prevHunk()
               if vim.wo.diff then return '[c' end
               vim.schedule(function() gs.prev_hunk() end)
               return '<Ignore>'
-            end, {expr=true})
+            end
+
+            local function stageHunk()
+              gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} 
+            end
+            
+            local function resetHunk()
+              gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} 
+            end
 
             -- Actions
-            map('n', '<leader>gs', gs.stage_hunk)
-            map('n', '<leader>gr', gs.reset_hunk)
-            map('v', '<leader>gs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
-            map('v', '<leader>gr', function() gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
-            map('n', '<leader>gS', gs.stage_buffer)
-            map('n', '<leader>gu', gs.undo_stage_hunk)
-            map('n', '<leader>gR', gs.reset_buffer)
-            map('n', '<leader>gp', gs.preview_hunk)
-            map('n', '<leader>gb', function() gs.blame_line{full=true} end)
-            map('n', '<leader>gtb', gs.toggle_current_line_blame)
-            map('n', '<leader>gd', gs.diffthis)
-            map('n', '<leader>gD', function() gs.diffthis('~') end)
-            map('n', '<leader>gtd', gs.toggle_deleted)
+            ${writeIf keys.enable ''
+            wk.register({
+              ["<leader>g"] = {
+                name = "Gitsigns",
+                b = { function() gs.blame_line{full=true} end, "Blame (full)" },
+                tb = { gs.toggle_current_line_blame, "Toggle blame" },
+                td = { gs.toggle_deleted, "Toggle deleted" },
+                d = { gs.diffthis, "Diff current file" },
+                D = { function() gs.diffthis('~') end, "Diff file" },
+                n = { nextHunk(), "Next hunk" },
+                p = { prevHunk(), "Previous hunk" },
+                r = { resetHunk(), "Reset hunk" },
+                s = { stageHunk(), "Stage hunk" },
+                S = { gs.stage_buffer, "Stage buffer" },
+                u = { gs.undo_stage_hunk, "Undo stage hunk" },
+                R = { gs.reset_buffer, "Reset buffer" },
+              },
+            })
+            ''}
 
             -- Text object
             map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')

diff --git a/modules/lsp/lsp.nix b/modules/lsp/lsp.nix
@@ -5,6 +5,7 @@ with builtins;
 
 let
   cfg = config.vim.lsp;
+  keys = config.vim.keys.whichKey;
 in
 {
   options.vim.lsp = {
@@ -91,11 +92,6 @@ in
       (withPlugins cfg.folds [ promise-async nvim-ufo ]) ++
       (withPlugins cfg.rust.enable [ crates-nvim rust-tools ]);
 
-    vim.nnoremap = withAttrSet cfg.scala.enable {
-      "<silent> <leader>ws" = "<cmd>lua require'metals'.worksheet_hover()<CR>";
-      "<silent> <leader>ad" = "<cmd>lua require'metals'.open_all_diagnostics()<CR>";
-    };
-
     vim.configRC = ''
       ${writeIf cfg.rust.enable ''
           function! MapRustTools()
@@ -247,6 +243,24 @@ in
         ''
       };
 
+      ${writeIf keys.enable ''
+        wk.register({
+          ["<leader>l"] = {
+            name = "LSP",
+          },
+        })
+
+        ${writeIf cfg.scala.enable ''
+        wk.register({
+          ["<leader>m"] = {
+            name = "Metals",
+            w = { "<cmd>lua require'metals'.worksheet_hover()<CR>", "Worksheet hover" },
+            d = { "<cmd>lua require'metals'.open_all_diagnostics()<CR>", "Open all diagnostics" },
+          },
+        })
+        ''}
+      ''}
+
       ${writeIf cfg.rust.enable ''
         -- Rust config
 

diff --git a/modules/lsp/nvim-code-action-menu.nix b/modules/lsp/nvim-code-action-menu.nix
@@ -5,6 +5,7 @@ with builtins;
 
 let
   cfg = config.vim.lsp;
+  keys = config.vim.keys.whichKey;
 in
 {
   options.vim.lsp.nvimCodeActionMenu.enable = mkEnableOption "nvim code action menu";
@@ -17,5 +18,15 @@ in
     vim.nnoremap = {
       "<silent><leader>ac" = "<cmd> CodeActionMenu<CR>";
     };
+
+    vim.luaConfigRC = ''
+      ${writeIf keys.enable ''
+        wk.register({
+          ["<leader>a"] = {
+            name = "Code actions",
+          },
+        })
+      ''}
+    '';
   };
 }
diff --git a/modules/lsp/trouble.nix b/modules/lsp/trouble.nix
@@ -5,6 +5,7 @@ with builtins;
 
 let
   cfg = config.vim.lsp;
+  keys = config.vim.keys.whichKey;
 in
 {
   options.vim.lsp.trouble.enable = mkEnableOption "trouble diagnostics viewer";
@@ -13,17 +14,25 @@ in
     vim.startPlugins = with pkgs.neovimPlugins; [ trouble ];
 
     vim.nnoremap = {
-      "<leader>xx" = "<cmd> TroubleToggle<CR>";
       "<leader>lwd" = "<cmd> TroubleToggle workspace_diagnostics<CR>";
       "<leader>ld" = "<cmd> TroubleToggle document_diagnostics<CR>";
       "<leader>lr" = "<cmd> TroubleToggle lsp_references<CR>";
+      "<leader>xx" = "<cmd> TroubleToggle<CR>";
       "<leader>xq" = "<cmd> TroubleToggle quickfix<CR>";
       "<leader>xl" = "<cmd> TroubleToggle loclist<CR>";
     };
 
     vim.luaConfigRC = ''
       -- Enable trouble diagnostics viewer
       require("trouble").setup {}
+
+      ${writeIf keys.enable ''
+        wk.register({
+          ["<leader>x"] = {
+            name = "Troubles",
+          },
+        })
+      ''}
     '';
   };
 }
diff --git a/modules/neoclip/default.nix b/modules/neoclip/default.nix
@@ -17,7 +17,7 @@ in
     vim.startPlugins = [ pkgs.neovimPlugins.nvim-neoclip ];
 
     vim.nnoremap = {
-      "<leader>nc" = "<cmd> Telescope neoclip unnamed extra=star,plus<CR>";
+      "<leader>fnc" = "<cmd> Telescope neoclip unnamed extra=star,plus<CR>";
     };
 
     vim.luaConfigRC = ''

diff --git a/modules/tabline/nvim-bufferline.nix b/modules/tabline/nvim-bufferline.nix
@@ -5,6 +5,7 @@ with builtins;
 
 let
   cfg = config.vim.tabline.nvimBufferline;
+  keys = config.vim.keys.whichKey;
 in
 {
   options.vim.tabline.nvimBufferline = {
@@ -94,6 +95,14 @@ in
               end,
            }
         }
+
+        ${writeIf keys.enable ''
+          wk.register({
+            ["<leader>b"] = {
+              name = "Buffers",
+            },
+          })
+        ''}
       '';
     }
   );

diff --git a/modules/telescope/default.nix b/modules/telescope/default.nix
@@ -5,6 +5,7 @@ with builtins;
 
 let
   cfg = config.vim.telescope;
+  keys = config.vim.keys.whichKey;
 in
 {
   options.vim.telescope = {
@@ -80,6 +81,14 @@ in
       })
       ''}
 
+      ${writeIf keys.enable ''
+        wk.register({
+          ["<leader>f"] = {
+            name = "Telescope",
+          },
+        })
+      ''}
+
       require("telescope").setup {
         defaults = {
           vimgrep_arguments = {