From 697fb497f08e2f15e5f652d1604e9d04ce865e5f Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Joshua Bell)" Date: Tue, 5 Dec 2023 04:42:44 -0600 Subject: [PATCH] which-key added back in --- cspell.json | 2 +- lazy-lock.json | 3 +- lua/keymaps.lua | 72 +++++++++++++++++++-------------- lua/plugins/colorpicker_ccc.lua | 2 +- lua/plugins/which-key.lua | 31 ++++++++++++++ 5 files changed, 77 insertions(+), 33 deletions(-) create mode 100644 lua/plugins/which-key.lua diff --git a/cspell.json b/cspell.json index 27ec63b..4b26b46 100644 --- a/cspell.json +++ b/cspell.json @@ -1 +1 @@ -{"language":"en","version":"0.2","words":["nvim","builtins","stylua","rustfmt","pendo","tanstack","ripgrep","Typeahead","overscan","autorun","mediatype","BIOINF","Transitioner","pkce","ilike","arrayify","arrayified","komodo","wezterm","gcloud","pbpaste","Hasher","semvers","upserted","dtos","Yeatts","Mahon","Beaubier","Taussing","chakra","langchain","openai","getattr","llms","docstore","kwargs","svgr","healthcheck","venv","virtualenv","ringofstorms","nestjs","oneshot","templating","tiktoken","pydantic","NCCN","clsx","reactflow","Convo","DSAB","pgvector","postprocess","stylelua","sqlx","genemichaels","williamboman","substr","findfile","Hammerspoon","eventtap","OSTYPE","sccache","binstall","elif","autofocus","colours","Resizer","esac","pannable","zoomable","elkjs","Arrayible","Falsey","xyflow","leftnav","topnav","nodrag","nowheel","janky","draghandle","Sandboxed","Dismissable","dashdraw","chrono","serde","rustls","schemars","webserver","concats","deepmerge","Customizer","reqwest","brotli","peekable","PDEPO","dotenv","taskserver","walkdir","uuidgen","tolower","nzzzv","tabprevious","tabnext","vsplit","tabclose","tabnew","Neotree","noequalalways","equalalways","bufdo","winnr","keymap","mapleader","maplocalleader","keymaps","setloclist"],"flagWords":[]} +{"language":"en","version":"0.2","flagWords":[],"words":["nvim","builtins","stylua","rustfmt","pendo","tanstack","ripgrep","Typeahead","overscan","autorun","mediatype","BIOINF","Transitioner","pkce","ilike","arrayify","arrayified","komodo","wezterm","gcloud","pbpaste","Hasher","semvers","upserted","dtos","Yeatts","Mahon","Beaubier","Taussing","chakra","langchain","openai","getattr","llms","docstore","kwargs","svgr","healthcheck","venv","virtualenv","ringofstorms","nestjs","oneshot","templating","tiktoken","pydantic","NCCN","clsx","reactflow","Convo","DSAB","pgvector","postprocess","stylelua","sqlx","genemichaels","williamboman","substr","findfile","Hammerspoon","eventtap","OSTYPE","sccache","binstall","elif","autofocus","colours","Resizer","esac","pannable","zoomable","elkjs","Arrayible","Falsey","xyflow","leftnav","topnav","nodrag","nowheel","janky","draghandle","Sandboxed","Dismissable","dashdraw","chrono","serde","rustls","schemars","webserver","concats","deepmerge","Customizer","reqwest","brotli","peekable","PDEPO","dotenv","taskserver","walkdir","uuidgen","tolower","nzzzv","tabprevious","tabnext","vsplit","tabclose","tabnew","Neotree","noequalalways","equalalways","bufdo","winnr","keymap","mapleader","maplocalleader","keymaps","setloclist","itertools"]} diff --git a/lazy-lock.json b/lazy-lock.json index 7f11f68..0280eff 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -47,5 +47,6 @@ "text-case.nvim": { "branch": "main", "commit": "ebe3650101a3505044559f71ec4ea4c789292164" }, "undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" }, "vim-floaterm": { "branch": "master", "commit": "3f01a623376957437f9376327637491b74719e38" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } + "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 9807253..8a63230 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -17,9 +17,9 @@ require("util").keymaps({ -- ============= -- n/v/x -- ============= - { ";", ":", desc = "No shift to enter command mode with semicolon. Alias ; to :", mode = nvx }, - { "a", "ggVG", desc = "Select all", mode = nvx }, - { "w", "w", desc = "Save", mode = nvx }, + { ";", ":", desc = "No shift to enter command mode with semicolon. Alias ; to :", mode = nvx }, + { "a", "ggVG", desc = "Select all", mode = nvx }, + { "w", "w", desc = "Save", mode = nvx }, { "q", function() @@ -40,34 +40,34 @@ require("util").keymaps({ desc = "Quit", mode = nvx, }, - { "Q", "Neotree closeqa", desc = "Quit all", mode = nvx }, - { "Q", "", mode = nvx }, -- don't do normal Q quit + { "Q", "Neotree closeqa", desc = "Quit all", mode = nvx }, + { "Q", "", mode = nvx }, -- don't do normal Q quit { "QQ", "Neotree closeSessionDeleteqa", desc = "Quit all, no session saved", mode = nvx, }, - { "y", '"+y', desc = "Copy to system clipboard", mode = nvx }, - { "p", '"+p', desc = "Paste from system clipboard", mode = nvx }, - { "bq", "bp|bd #", desc = "Close current buffer only", mode = nvx }, - { "tn", "tabnew", desc = "Create new tab", mode = nvx }, - { "tq", "tabclose", desc = "Close current tab", mode = nvx }, - { "H", "tabprevious", desc = "Move to previous tab", mode = nvx }, - { "L", "tabnext", desc = "Move to next tab", mode = nvx }, - { "|", "vsplit", desc = "Vertical Split", mode = nvx }, - { "\\", "split", desc = "Horizontal Split", mode = nvx }, + { "y", '"+y', desc = "Copy to system clipboard", mode = nvx }, + { "p", '"+p', desc = "Paste from system clipboard", mode = nvx }, + { "bq", "bp|bd #", desc = "Close current buffer only", mode = nvx }, + { "tn", "tabnew", desc = "Create new tab", mode = nvx }, + { "tq", "tabclose", desc = "Close current tab", mode = nvx }, + { "H", "tabprevious", desc = "Move to previous tab", mode = nvx }, + { "L", "tabnext", desc = "Move to next tab", mode = nvx }, + { "|", "vsplit", desc = "Vertical Split", mode = nvx }, + { "\\", "split", desc = "Horizontal Split", mode = nvx }, { "S", "set equalalwaysset noequalalways", desc = "Equalize/resize screens evenly", mode = nvx, }, - { "", "h", desc = "Move window left current", mode = nvx }, - { "", "j", desc = "Move window below current", mode = nvx }, - { "", "k", desc = "Move window above current", mode = nvx }, - { "", "l", desc = "Move window right current", mode = nvx }, - { "B", "b#", desc = "Switch to last buffer", mode = nvx }, + { "", "h", desc = "Move window left current", mode = nvx }, + { "", "j", desc = "Move window below current", mode = nvx }, + { "", "k", desc = "Move window above current", mode = nvx }, + { "", "l", desc = "Move window right current", mode = nvx }, + { "B", "b#", desc = "Switch to last buffer", mode = nvx }, { "l", function() @@ -100,6 +100,18 @@ require("util").keymaps({ mode = nvx, }, + -- ============= + -- normal mode + -- ============= + { "n", "nzzzv", desc = "Next search result centered" }, + { "N", "Nzzzv", desc = "Previous search result centered" }, + { "", ":noh", desc = "Clear search on escape" }, + { "", ":noh", desc = "Clear search on return" }, + { "", "zz", desc = "Vertical half page down and center cursor" }, + { "", "zz", desc = "Vertical half page up and center cursor" }, + { "J", "mzJ`z", desc = "Move line below onto this line" }, + { "", "", desc = "Go back " }, + -- ============= -- VISUAL -- ============= @@ -121,20 +133,20 @@ require("util").keymaps({ desc = "Generate and replace UUID", mode = "v", }, - { "p", '"_dP', desc = "Paste without yanking replaced content", mode = "v" }, - { "", '"hy:%s/h//g', desc = "Replace current selection", mode = "v" }, - { ">", "> gv", desc = "Indent selection", mode = "v" }, - { "<", "< gv", desc = "Outdent selection", mode = "v" }, + { "p", '"_dP', desc = "Paste without yanking replaced content", mode = "v" }, + { "", '"hy:%s/h//g', desc = "Replace current selection", mode = "v" }, + { ">", "> gv", desc = "Indent selection", mode = "v" }, + { "<", "< gv", desc = "Outdent selection", mode = "v" }, -- ============= -- insert / command -- ============= - { "", "", desc = "Up", mode = { "i", "c" } }, - { "", "", desc = "Down", mode = { "i", "c" } }, - { "", "", desc = "Left", mode = { "i", "c" } }, - { "", "", desc = "Right", mode = { "i", "c" } }, - { "", "", desc = "End", mode = { "i", "c" } }, - { "", "", desc = "Home", mode = { "i", "c" } }, + { "", "", desc = "Up", mode = { "i", "c" } }, + { "", "", desc = "Down", mode = { "i", "c" } }, + { "", "", desc = "Left", mode = { "i", "c" } }, + { "", "", desc = "Right", mode = { "i", "c" } }, + { "", "", desc = "End", mode = { "i", "c" } }, + { "", "", desc = "Home", mode = { "i", "c" } }, -- ============= -- command -- ============= @@ -142,5 +154,5 @@ require("util").keymaps({ -- ============= -- terminal -- ============= - { "", "", desc = "Escape the terminal", mode = "t" }, + { "", "", desc = "Escape the terminal", mode = "t" }, }) diff --git a/lua/plugins/colorpicker_ccc.lua b/lua/plugins/colorpicker_ccc.lua index 6835b68..3f3b868 100644 --- a/lua/plugins/colorpicker_ccc.lua +++ b/lua/plugins/colorpicker_ccc.lua @@ -2,6 +2,6 @@ return { "uga-rosa/ccc.nvim", event = "BufRead", keys = { - { ",cp", ":CccPick ", desc = "Color Picker" }, + { ",p", ":CccPick ", desc = "Color Picker" }, }, } diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua new file mode 100644 index 0000000..6089c5a --- /dev/null +++ b/lua/plugins/which-key.lua @@ -0,0 +1,31 @@ +return { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 250 + end, + opts = { + window = { + border = "single", + }, + }, + config = function(_, opts) + local wk = require("which-key") + wk.setup(opts) + + wk.register({ + ["b"] = { name = "Buffers" }, + [","] = { name = "Miscellaneous Tools" }, + ["c"] = { name = "Copilot" }, + ["f"] = { name = "Find [Telescope]" }, + ["fs"] = { name = "Find in Scratches [Telescope]" }, + ["g"] = { name = "Git" }, + ["l"] = { name = "LSP" }, + ["lf"] = { name = "LSP Find" }, + ["Q"] = { name = "+Q Quit and remove session" }, + ["s"] = { name = "Scratch Files" }, + ["t"] = { name = "Tabs" }, + }) + end, +}