which-key added back in

This commit is contained in:
RingOfStorms (Joshua Bell) 2023-12-05 04:42:44 -06:00
parent dc9536eb56
commit 697fb497f0
5 changed files with 77 additions and 33 deletions

View file

@ -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"]}

View file

@ -47,5 +47,6 @@
"text-case.nvim": { "branch": "main", "commit": "ebe3650101a3505044559f71ec4ea4c789292164" }, "text-case.nvim": { "branch": "main", "commit": "ebe3650101a3505044559f71ec4ea4c789292164" },
"undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" }, "undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" },
"vim-floaterm": { "branch": "master", "commit": "3f01a623376957437f9376327637491b74719e38" }, "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" }
} }

View file

@ -17,9 +17,9 @@ require("util").keymaps({
-- ============= -- =============
-- n/v/x -- n/v/x
-- ============= -- =============
{ ";", ":", desc = "No shift to enter command mode with semicolon. Alias ; to :", mode = nvx }, { ";", ":", desc = "No shift to enter command mode with semicolon. Alias ; to :", mode = nvx },
{ "<leader>a", "<esc>ggVG", desc = "Select all", mode = nvx }, { "<leader>a", "<esc>ggVG", desc = "Select all", mode = nvx },
{ "<leader>w", "<cmd>w<cr>", desc = "Save", mode = nvx }, { "<leader>w", "<cmd>w<cr>", desc = "Save", mode = nvx },
{ {
"<leader>q", "<leader>q",
function() function()
@ -40,34 +40,34 @@ require("util").keymaps({
desc = "Quit", desc = "Quit",
mode = nvx, mode = nvx,
}, },
{ "Q", "<cmd>Neotree close<cr><cmd>qa<CR>", desc = "Quit all", mode = nvx }, { "Q", "<cmd>Neotree close<cr><cmd>qa<CR>", desc = "Quit all", mode = nvx },
{ "<leader>Q", "<nop>", mode = nvx }, -- don't do normal Q quit { "<leader>Q", "<nop>", mode = nvx }, -- don't do normal Q quit
{ {
"<leader>QQ", "<leader>QQ",
"<cmd>Neotree close<cr><cmd>SessionDelete<cr><cmd>qa<CR>", "<cmd>Neotree close<cr><cmd>SessionDelete<cr><cmd>qa<CR>",
desc = "Quit all, no session saved", desc = "Quit all, no session saved",
mode = nvx, mode = nvx,
}, },
{ "<leader>y", '"+y', desc = "Copy to system clipboard", mode = nvx }, { "<leader>y", '"+y', desc = "Copy to system clipboard", mode = nvx },
{ "<leader>p", '"+p', desc = "Paste from system clipboard", mode = nvx }, { "<leader>p", '"+p', desc = "Paste from system clipboard", mode = nvx },
{ "<leader>bq", "<cmd>bp|bd #<cr>", desc = "Close current buffer only", mode = nvx }, { "<leader>bq", "<cmd>bp|bd #<cr>", desc = "Close current buffer only", mode = nvx },
{ "<leader>tn", "<cmd>tabnew<cr>", desc = "Create new tab", mode = nvx }, { "<leader>tn", "<cmd>tabnew<cr>", desc = "Create new tab", mode = nvx },
{ "<leader>tq", "<cmd>tabclose<cr>", desc = "Close current tab", mode = nvx }, { "<leader>tq", "<cmd>tabclose<cr>", desc = "Close current tab", mode = nvx },
{ "H", "<cmd>tabprevious<cr>", desc = "Move to previous tab", mode = nvx }, { "H", "<cmd>tabprevious<cr>", desc = "Move to previous tab", mode = nvx },
{ "L", "<cmd>tabnext<cr>", desc = "Move to next tab", mode = nvx }, { "L", "<cmd>tabnext<cr>", desc = "Move to next tab", mode = nvx },
{ "|", "<cmd>vsplit<cr>", desc = "Vertical Split", mode = nvx }, { "|", "<cmd>vsplit<cr>", desc = "Vertical Split", mode = nvx },
{ "\\", "<cmd>split<cr>", desc = "Horizontal Split", mode = nvx }, { "\\", "<cmd>split<cr>", desc = "Horizontal Split", mode = nvx },
{ {
"<leader>S", "<leader>S",
"<cmd>set equalalways<cr><cmd>set noequalalways<cr>", "<cmd>set equalalways<cr><cmd>set noequalalways<cr>",
desc = "Equalize/resize screens evenly", desc = "Equalize/resize screens evenly",
mode = nvx, mode = nvx,
}, },
{ "<C-h>", "<C-w>h", desc = "Move window left current", mode = nvx }, { "<C-h>", "<C-w>h", desc = "Move window left current", mode = nvx },
{ "<C-j>", "<C-w>j", desc = "Move window below current", mode = nvx }, { "<C-j>", "<C-w>j", desc = "Move window below current", mode = nvx },
{ "<C-k>", "<C-w>k", desc = "Move window above current", mode = nvx }, { "<C-k>", "<C-w>k", desc = "Move window above current", mode = nvx },
{ "<C-l>", "<C-w>l", desc = "Move window right current", mode = nvx }, { "<C-l>", "<C-w>l", desc = "Move window right current", mode = nvx },
{ "B", "<cmd>b#<cr>", desc = "Switch to last buffer", mode = nvx }, { "B", "<cmd>b#<cr>", desc = "Switch to last buffer", mode = nvx },
{ {
"<leader>l<leader>", "<leader>l<leader>",
function() function()
@ -100,6 +100,18 @@ require("util").keymaps({
mode = nvx, mode = nvx,
}, },
-- =============
-- normal mode
-- =============
{ "n", "nzzzv", desc = "Next search result centered" },
{ "N", "Nzzzv", desc = "Previous search result centered" },
{ "<esc>", ":noh<CR><esc>", desc = "Clear search on escape" },
{ "<return>", ":noh<CR><return>", desc = "Clear search on return" },
{ "<C-d>", "<C-d>zz", desc = "Vertical half page down and center cursor" },
{ "<C-u>", "<C-u>zz", desc = "Vertical half page up and center cursor" },
{ "J", "mzJ`z", desc = "Move line below onto this line" },
{ "<S-Tab>", "<C-o>", desc = "Go back <C-o>" },
-- ============= -- =============
-- VISUAL -- VISUAL
-- ============= -- =============
@ -121,20 +133,20 @@ require("util").keymaps({
desc = "Generate and replace UUID", desc = "Generate and replace UUID",
mode = "v", mode = "v",
}, },
{ "p", '"_dP', desc = "Paste without yanking replaced content", mode = "v" }, { "p", '"_dP', desc = "Paste without yanking replaced content", mode = "v" },
{ "<C-r>", '"hy:%s/<C-r>h//g<left><left>', desc = "Replace current selection", mode = "v" }, { "<C-r>", '"hy:%s/<C-r>h//g<left><left>', desc = "Replace current selection", mode = "v" },
{ ">", "> gv", desc = "Indent selection", mode = "v" }, { ">", "> gv", desc = "Indent selection", mode = "v" },
{ "<", "< gv", desc = "Outdent selection", mode = "v" }, { "<", "< gv", desc = "Outdent selection", mode = "v" },
-- ============= -- =============
-- insert / command -- insert / command
-- ============= -- =============
{ "<C-k>", "<Up>", desc = "Up", mode = { "i", "c" } }, { "<C-k>", "<Up>", desc = "Up", mode = { "i", "c" } },
{ "<C-j>", "<Down>", desc = "Down", mode = { "i", "c" } }, { "<C-j>", "<Down>", desc = "Down", mode = { "i", "c" } },
{ "<C-h>", "<Left>", desc = "Left", mode = { "i", "c" } }, { "<C-h>", "<Left>", desc = "Left", mode = { "i", "c" } },
{ "<C-l>", "<Right>", desc = "Right", mode = { "i", "c" } }, { "<C-l>", "<Right>", desc = "Right", mode = { "i", "c" } },
{ "<C-4>", "<End>", desc = "End", mode = { "i", "c" } }, { "<C-4>", "<End>", desc = "End", mode = { "i", "c" } },
{ "<C-6>", "<Home>", desc = "Home", mode = { "i", "c" } }, { "<C-6>", "<Home>", desc = "Home", mode = { "i", "c" } },
-- ============= -- =============
-- command -- command
-- ============= -- =============
@ -142,5 +154,5 @@ require("util").keymaps({
-- ============= -- =============
-- terminal -- terminal
-- ============= -- =============
{ "<Esc>", "<C-\\><C-n>", desc = "Escape the terminal", mode = "t" }, { "<Esc>", "<C-\\><C-n>", desc = "Escape the terminal", mode = "t" },
}) })

View file

@ -2,6 +2,6 @@ return {
"uga-rosa/ccc.nvim", "uga-rosa/ccc.nvim",
event = "BufRead", event = "BufRead",
keys = { keys = {
{ "<leader>,cp", ":CccPick <CR>", desc = "Color Picker" }, { "<leader>,p", ":CccPick <CR>", desc = "Color Picker" },
}, },
} }

31
lua/plugins/which-key.lua Normal file
View file

@ -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({
["<leader>b"] = { name = "Buffers" },
["<leader>,"] = { name = "Miscellaneous Tools" },
["<leader>c"] = { name = "Copilot" },
["<leader>f"] = { name = "Find [Telescope]" },
["<leader>fs"] = { name = "Find in Scratches [Telescope]" },
["<leader>g"] = { name = "Git" },
["<leader>l"] = { name = "LSP" },
["<leader>lf"] = { name = "LSP Find" },
["<leader>Q"] = { name = "+Q Quit and remove session" },
["<leader>s"] = { name = "Scratch Files" },
["<leader>t"] = { name = "Tabs" },
})
end,
}