From d26d90857d7a6d392f76a5acb68f736e37777244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Wed, 27 Mar 2024 11:12:59 +0100
Subject: [PATCH] feat: better keymap display

---
 home/programs/nixvim/default.nix | 56 ++++++++++++++++++++++++--------
 home/programs/nixvim/keymaps.nix | 13 ++------
 2 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/home/programs/nixvim/default.nix b/home/programs/nixvim/default.nix
index 447d49c..739b2d9 100644
--- a/home/programs/nixvim/default.nix
+++ b/home/programs/nixvim/default.nix
@@ -137,17 +137,7 @@ in {
           };
           icon = "";
         }];
-        lualine_x = [
-          { name = "fancy_lsp_servers"; }
-          {
-            name = "filetype";
-            extraConfig = { icon_only = true; };
-            padding = {
-              left = 1;
-              right = 2;
-            };
-          }
-        ];
+        lualine_x = [ { name = "filesize"; } { name = "filetype"; } ];
         lualine_z = [{
           name = "location";
           separator = {
@@ -187,7 +177,6 @@ in {
     };
     toggleterm = {
       enable = true;
-      openMapping = "<leader>t";
       direction = "vertical";
       size = 60;
     };
@@ -397,7 +386,48 @@ in {
       };
     };
 
-    which-key = { enable = true; };
+    which-key = {
+      enable = true;
+      registrations = {
+        "<leader>p" = "Paste Keep Buffer";
+        "<leader>n" = "Hover";
+        "<leader>g" = "Git";
+        "<leader>u" = "Undotree";
+        "<leader>s" = {
+          name = "LSP";
+          r = "References";
+          d = "Definitions";
+          i = "Implementations";
+          s = "Document Symbols";
+          w = "Workspace Symbols";
+          t = "Type Definitions";
+          h = "Diagnostics";
+          a = "Code Actions";
+        };
+        "<leader>x" = {
+          name = "Trouble";
+          x = "Toggle";
+          w = "Workspace Diagnostics";
+          d = "Document Diagnostics";
+          q = "Quickfix";
+          l = "Loclist";
+        };
+        "<leader>f" = {
+          name = "Find";
+          t = "Tree";
+          f = "File";
+          a = "Untracked Files";
+          g = "Grep";
+          b = "Buffer";
+        };
+        h = {
+          name = "Harpoon";
+          m = "Mark";
+          n = "Next";
+          p = "Prev";
+        };
+      };
+    };
 
     copilot-lua = {
       enable = true;
diff --git a/home/programs/nixvim/keymaps.nix b/home/programs/nixvim/keymaps.nix
index 0a4c2d2..0c6adbb 100644
--- a/home/programs/nixvim/keymaps.nix
+++ b/home/programs/nixvim/keymaps.nix
@@ -4,14 +4,11 @@
     mode = "n";
     action = "<cmd>:UndotreeToggle<CR>";
   }
+  # Find/Navigate
   {
     key = "<leader>ft";
     action = "<cmd>:Neotree toggle<CR>";
   }
-  {
-    key = "<leader>s";
-    action = "<cmd>:SymbolsOutline<CR>";
-  }
   {
     key = "J";
     mode = "v";
@@ -60,6 +57,7 @@
     mode = "n";
     action = ":Telescope harpoon marks<CR>";
   }
+  # LSP Actions
   {
     key = "<leader>sa";
     mode = "n";
@@ -67,6 +65,7 @@
     lua = true;
     action = "require('actions-preview').code_actions";
   }
+  # Trouble
   {
     key = "<leader>xx";
     mode = "n";
@@ -98,10 +97,4 @@
     lua = true;
     action = "function() require('trouble').toggle('loclist') end";
   }
-  {
-    key = "gR";
-    mode = "n";
-    lua = true;
-    action = "function() require('trouble').toggle('lsp_references') end";
-  }
 ]