diff --git a/nvim/README.md b/nvim/README.md index f8ce081..d9731b0 100644 --- a/nvim/README.md +++ b/nvim/README.md @@ -13,17 +13,32 @@ | \ | window up | | \ | window down | | \ | window right | +| \ | open file tree (root | +| \ | open file tree (cwd) | ## Debugging -| key | Description | -| ----------- | ------------------------- | -| dt | toggle breakpoint | -| do | step over breakpoint | -| di | step into breakpoint | -| dc | continue from breakpoint | -| dt | start debugging | -| dq | close debug UI | +| key | Description | +| ----------- | --------------------- | +| da | run with args | +| db | toggle breakpoint | +| dB | breakpoint condition | +| dC | run to cursoor | +| dc | continue | +| de | eval | +| dg | go to line | +| di | step into | +| k | down | +| l | up | +| ; | run last | +| dO | step over | +| do | step out | +| dp | pause | +| dr | toggle repl | +| ds | session | +| dt | terminate | +| du | DAP UI | +| dw | widgets | ## neotest | key | Description | @@ -31,22 +46,6 @@ | tt | execute all tests | | tT | execute nearest test | -## Nvim-Tree -| key | Description | -| --- | -------------------------- | -| f | toggle open | -| a | create new file | -| d | remove file | -| r | rename file | -| y | copy name | -| Y | copy path | -| x | cut file | -| c | copy file | -| p | paste file | -| f | filter (inside nvim tree) | -| E | expand all folders | -| W | collapse all folders | - ## buffer switching | key | Description | | --- | ------------------------- | @@ -72,9 +71,10 @@ | ---------- | ------------------------- | | gq | show commits | | gw | show commits with diff | -| ge | show branches | +| gb | show branches | | gr | show git status | | ga | show git stash | +| ge | git file tree | ### project telescope @@ -94,30 +94,30 @@ | key | Description | | -------- | --------------------------------- | -| Ctrl + d | delete project | -| Ctrl + v | rename project | -| Ctrl + a | create project | -| Ctrl + s | search files in project | -| Ctrl + b | browse files in project | -| Ctrl + l | change directory to project | -| Ctrl + r | recently opened files in project | -| Ctrl + f | find file within project | +| | delete project | +| | rename project | +| | create project | +| | search files in project | +| | browse files in project | +| | change directory to project | +| | recently opened files in project | +| | find file within project |
normal mode insert mode
## toggletrouble -| key | Description | -| -------- | ------------------------- | -| Ctrl + f | show errors and warnings | +| key | Description | +| ---------- | ------------------------- | +| t | show errors and warnings | ## cmp Note, these require the cmp list view to be open to do anything! | key | Description | | ----------- | --------------------------------------------------------- | -| Ctrl + b | scroll docs up | -| Ctrl + f | scroll docs down | -| Ctrl + e | cancel cmp | +| | scroll docs up | +| | scroll docs down | +| | cancel cmp | | Enter | write selected suggestion (does nothing if not selected) | | Tab |scroll down through suggestion list | | Shift + Tab | scroll up through suggestion list | @@ -125,22 +125,23 @@ Note, these require the cmp list view to be open to do anything! ## LSP | key | Description | | ------------ | ---------------------- | -| Leader + ca | go to declaration | -| Leader + cs | go to definition | -| Leader + cd | go to type definitions | -| Leader + cf | go to references | -| Leader + cq | fix code action | -| Leader + cQ | refactor code action | -| Leader + cw | signature help | -| Leader + ce | hover | -| Leader + cr | rename | +| ca | go to definition | +| ca | go to declaration | +| cs | find references | +| cd | go to type definition | +| cf | go to implementation | +| cq | fix code action | +| cQ | refactor code action | +| cw | signature help | +| ce | hover | +| cr | rename | ## snippets These require you to be inside a snippet! | key | Description | | -------- | ------------------------- | -| Ctrl + j | jump to next entry | -| Ctrl + k | jump to previous entry | +| | jump to next entry | +| | jump to previous entry | ## Leap | key | Description | diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua index f98d3b4..a85ceff 100644 --- a/nvim/lua/config/keymaps.lua +++ b/nvim/lua/config/keymaps.lua @@ -67,7 +67,7 @@ end, { desc = "Commits" }) map("n", "gw", function() require("telescope.builtin").git_bcommits() end, { desc = "Commits in branch" }) -map("n", "ge", function() +map("n", "gb", function() require("telescope.builtin").git_branches() end, { desc = "Branches" }) map("n", "gr", function() diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 39513fb..851193c 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -52,9 +52,6 @@ return { "typ", }, }, - gopls = { - staticcheck = true, - }, sqlls = {}, taplo = {}, lemminx = {}, diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua index 5689a90..b830e0b 100644 --- a/nvim/lua/plugins/plugins.lua +++ b/nvim/lua/plugins/plugins.lua @@ -262,4 +262,30 @@ return { }, }, }, + { + "rcarriga/nvim-dap-ui", + keys = { + { + "dk", + function() + require("dap").down() + end, + desc = "Down", + }, + { + "dl", + function() + require("dap").up() + end, + desc = "Up", + }, + { + "d;", + function() + require("dap").run_last() + end, + desc = "Run Last", + }, + }, + }, }