init.lua @ a146977

M lua/fk/plugin.lua

@@ -89,7 +89,7 @@ -- Tests
   use {
     "rcarriga/vim-ultest",
     requires = { { "vim-test/vim-test", after = "vim-ultest" } },
-    cmd = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestStopNearest", "UltestOutput", "UltestSummary" },
+    cmd = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestOutput" },
   }
 
   -- Syntax

M lua/fk/plugin/whichkey.lua

@@ -32,7 +32,7 @@ },
   layout = {
     height = { min = 4, max = 25 },
     width = { min = 20, max = 50 },
-    spacing = 3,
+    spacing = 4,
     align = "left",
   },
 }
@@ -53,8 +53,8 @@ b = { "<cmd>Telescope buffers<cr>", "Find buffer" },
   w = { "<cmd>write!<cr>", "Save file" },
   q = { "<cmd>quit!<cr>", "Quit" },
   c = { "<cmd>bdelete!<cr>", "Close buffer" },
-  h = { "<cmd>nohlsearch<cr>", "No hl" },
-  n = { "<cmd>e! /tmp/note.md<cr>", "Note" },
+  h = { "<cmd>nohlsearch<cr>", "No search hl" },
+  n = { "<cmd>e! /tmp/note.md<cr>", "Open note" },
   s = {
     name = "Search",
     t = { "<cmd>Telescope live_grep<cr>", "Live grep" },
@@ -66,31 +66,32 @@ k = { "<cmd>Telescope keymaps<cr>", "Find keymap" },
     p = { "<cmd>Telescope projects<cr>", "Projects" },
   },
   l = {
-    name = "LSP",
+    name = "Lsp",
     a = { "<cmd>Telescope lsp_code_actions<cr>", "Code actions" },
-    d = { "<cmd>TroubleToggle<cr>", "Diagnostics" },
+    q = { "<cmd>TroubleToggle<cr>", "Diagnostics menu" },
     r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename" },
-    f = { "<cmd>lua vim.lsp.buf.formatting()<cr>", "Formatting" },
-    i = { "<cmd>LspInfo<cr>", "Info" },
-    R = { "<cmd>LspRestart<cr>", "Restart server" },
+    f = { "<cmd>lua vim.lsp.buf.formatting()<cr>", "Format" },
+    i = { "<cmd>LspInfo<cr>", "Lsp info" },
+    R = { "<cmd>LspRestart<cr>", "Restart lsp server" },
     s = { "<cmd>Telescope lsp_document_symbols<cr>", "Document Symbols" },
-    l = { "<cmd>lua vim.lsp.codelens.run()<cr>", "CodeLens Action" },
-    j = { "<cmd>lua vim.diagnostic.goto_next()<cr>", "Next Diagnostic" },
-    q = { "<cmd>lua vim.diagnostic.setloclist()<cr>", "Quickfix" },
-    k = { "<cmd>lua vim.diagnostic.goto_prev()<cr>", "Prev Diagnostic" },
+    l = { "<cmd>lua vim.lsp.codelens.run()<cr>", "CodeLens action" },
+    j = { "<cmd>lua vim.diagnostic.goto_next()<cr>", "Next diagnostic" },
+    k = { "<cmd>lua vim.diagnostic.goto_prev()<cr>", "Prev diagnostic" },
   },
   t = {
-    name = "Tests",
-    t = { "<cmd>Ultest<cr>", "Run all" },
-    s = { "<cmd>UltestStop<cr>", "Stop all" },
-    c = { "<cmd>UltestClear<cr>", "Clean results" },
-    n = { "<cmd>UltestNearest<cr>", "Run nearest" },
-    N = { "<cmd>UltestStopNearest<cr>", "Stop nearest" },
-    o = { "<cmd>UltestOutput<cr>", "Show output" },
-    S = { "<cmd>UltestSummary<cr>", "Summary win" },
+    name = "Tests/tabs",
+    t = { "<cmd>Ultest<cr>", "Run all tests" },
+    s = { "<cmd>UltestStop<cr>", "Stop all runned tests" },
+    C = { "<cmd>UltestClear<cr>", "Clean tests results" },
+    n = { "<cmd>UltestNearest<cr>", "Run test under cursor" },
+    O = { "<cmd>UltestOutput<cr>", "Show test result" },
+
+    l = { "<cmd>tabnext<cr>", "Next tab" },
+    h = { "<cmd>tabprev<cr>", "Prev tab" },
+    N = { "<cmd>tabnew<cr>", "New tab" },
   },
   g = {
-    name = "git",
+    name = "Git",
     s = { "<cmd>lua require[[gitsigns]].stage_hunk()<cr>", "Stage hunk" },
     r = { "<cmd>lua require[[gitsigns]].reset_hunk()<cr>", "Reset hunk" },
     p = { "<cmd>lua require[[gitsigns]].preview_hunk()<cr>", "Preview hunk" },