From e37dff7e99d8185fee67a3f095a47c997bb9aa56 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sun, 14 Jul 2024 22:06:04 +0300 Subject: [PATCH] Update which-key --- lazy-lock.json | 40 +++---- lua/plugins/conform.lua | 1 + lua/plugins/dap.lua | 3 + lua/plugins/which-key.lua | 237 +++++++++++++++++++------------------- 4 files changed, 142 insertions(+), 139 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index e8bbe91..232dd99 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -15,7 +15,7 @@ "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, "cmp-dotenv": { "branch": "main", "commit": "4dd53aab60982f1f75848aec5e6214986263325e" }, - "cmp-git": { "branch": "main", "commit": "8dfbc33fb32c33e5c0be9dcc8176a4f4d395f95e" }, + "cmp-git": { "branch": "main", "commit": "22116bdffbe68bfc6ca05d52e9f217587cbfea8b" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-pypi": { "branch": "main", "commit": "a73411e5935caa23c6feab34980bb435deadd482" }, @@ -23,7 +23,7 @@ "codeium.nvim": { "branch": "main", "commit": "d3b88eb3aa1de6da33d325c196b8a41da2bcc825" }, "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, "crates.nvim": { "branch": "main", "commit": "5d2751f3d31c952663ade44669b6b63efa06e295" }, - "curl.nvim": { "branch": "main", "commit": "1acfa8a3dec6b6a4d4df6239e0d5dba0e017a0dc" }, + "curl.nvim": { "branch": "main", "commit": "9c4583dacab870705e9c69970be85f4e2777e356" }, "darkplus.nvim": { "branch": "master", "commit": "c7fff5ce62406121fc6c9e4746f118b2b2499c4c" }, "decisive.nvim": { "branch": "main", "commit": "53a1e1a715fd93ccb5d705181413f726b4276431" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, @@ -33,7 +33,7 @@ "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, "gitignore.nvim": { "branch": "master", "commit": "2455191ec94da8ed222806a4fe3aa358eac1e558" }, "gitpad.nvim": { "branch": "main", "commit": "1e0f6fa335c72c05d1d3635120c572e198e5ae0d" }, - "gitsigns.nvim": { "branch": "main", "commit": "7178d1a430dcfff8a4c92d78b9e39e0297a779c0" }, + "gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" }, "gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, "harpoon-lualine": { "branch": "master", "commit": "d1b873c19b701fd80d60a67d086dbb3bcc4eb00e" }, @@ -45,7 +45,7 @@ "inlay-hints.nvim": { "branch": "master", "commit": "1d5bd49a43f8423bc56f5c95ebe8fe3f3b96ed58" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, "lackluster.nvim": { "branch": "main", "commit": "362e40056bb582ced43447d63bc1055e99f14ba4" }, - "lazy.nvim": { "branch": "main", "commit": "1d451b4c2ce957da05e2123ce1a001804fc7ea96" }, + "lazy.nvim": { "branch": "main", "commit": "b02c9eae6a250f98908c146d1dc1a891f5019f0a" }, "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" }, @@ -56,13 +56,13 @@ "mason-nvim-dap.nvim": { "branch": "main", "commit": "4ba55f9755ebe8297d92c419b90a946123292ae6" }, "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" }, "melange.nvim": { "branch": "master", "commit": "f626d41b9110e6ab853538d8b939979a0f1adfeb" }, - "neoconf.nvim": { "branch": "main", "commit": "519b6777ef2c1d9d0d944b090a51bd83022c0103" }, + "neoconf.nvim": { "branch": "main", "commit": "23f24edab5f78465a0bc3320678e038664b9aa6e" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" }, "neogit": { "branch": "master", "commit": "16ee9ae957db2142fb189f5f2556123e24c5b7fb" }, "neorg": { "branch": "main", "commit": "ace80b05771b65d6633f3c64b8d930b5787f20d0" }, - "neorg-telescope": { "branch": "main", "commit": "fe255a3432ce639de7a374ccfb8602f517244dcd" }, - "neotest": { "branch": "master", "commit": "0fe9186afac9b7874ba304fd28d6325d07e5e274" }, + "neorg-telescope": { "branch": "main", "commit": "b4ca2f231fdf7dd915848111e6a041fe4355009a" }, + "neotest": { "branch": "master", "commit": "32ff2ac21135a372a42b38ae131e531e64833bd3" }, "neotest-gtest": { "branch": "main", "commit": "b44c8afc26cea75ffc80617ce07b4e745a56e589" }, "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, "neotest-vitest": { "branch": "main", "commit": "353364aa05b94b09409cbef21b79c97c5564e2ce" }, @@ -70,18 +70,18 @@ "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" }, - "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nvim-cmp": { "branch": "main", "commit": "7e348da6e5085ac447144a2ef4b637220ba27209" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" }, "nvim-dap-python": { "branch": "master", "commit": "d777c2b32ed39f61209c09bede28d7491621a631" }, - "nvim-dap-ui": { "branch": "master", "commit": "754104da429457bff733444a3048bc8296daf775" }, + "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" }, "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, - "nvim-lspconfig": { "branch": "master", "commit": "cf97d2485fc3f6d4df1b79a3ea183e24c272215e" }, + "nvim-lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-silicon": { "branch": "main", "commit": "b305ad8a45210f0dc8bbba1494dea6af072c0ed2" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-treesitter": { "branch": "master", "commit": "465840f8c14126e5193d777bbff94036eb875bd5" }, + "nvim-treesitter": { "branch": "master", "commit": "7f4ac678770175cdf0d42c015f4a5b6e18b6cb33" }, "nvim-treesitter-context": { "branch": "master", "commit": "f56a1430f21334868a86eb980b12e0af55690e98" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, "nvim-ts-autotag": { "branch": "main", "commit": "323a3e16ed603e2e17b26b1c836d1e86c279f726" }, @@ -92,7 +92,7 @@ "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, "pathlib.nvim": { "branch": "main", "commit": "7a5a6facd29e306bc73a37719fa67c0d2226f852" }, "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, - "persistence.nvim": { "branch": "main", "commit": "c45ff862b53ce07a853a753fb0b33e148dbb99d2" }, + "persistence.nvim": { "branch": "main", "commit": "1e7d01fc7f465af6c935361918bb5406cec736f9" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, @@ -114,12 +114,12 @@ "telescope-software-licenses.nvim": { "branch": "master", "commit": "fb5fc33b6afc994756e2f372423c365bf66f2256" }, "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "todo-comments.nvim": { "branch": "main", "commit": "313b04e5b02d29ab9275c9295ff5e2b73921b0eb" }, - "tokyonight.nvim": { "branch": "main", "commit": "66a272ba6cf93bf303c4b7a91b100ca0dd3ec7bd" }, + "todo-comments.nvim": { "branch": "main", "commit": "d61567557e2ff5c548c74e96b2d9f8d33e5fcb34" }, + "tokyonight.nvim": { "branch": "main", "commit": "b357de8d1d8d0d90be0d7f7750c7aa7eb7f4b020" }, "tree-sitter-hyprlang": { "branch": "master", "commit": "6858695eba0e63b9e0fceef081d291eb352abce8" }, "treesitter-utils": { "branch": "main", "commit": "df621499e4227f0476f6f4bdb75a9d8dd18d16f2" }, "trouble.nvim": { "branch": "main", "commit": "026e420bf9878ee97133f8fbf906261f3249b17a" }, - "twilight.nvim": { "branch": "main", "commit": "da4fe0a9e1397ecd9b012c52fb34313fbd3b862f" }, + "twilight.nvim": { "branch": "main", "commit": "2b632c169a4b51b1eba5be90fde22a80c51c990e" }, "typecheck.nvim": { "branch": "main", "commit": "38f3c135572a287f468bae269f956f4ba53dbddf" }, "typescript-tools.nvim": { "branch": "master", "commit": "5da4d695d66f676eb6ea766b946e86f93baaafe7" }, "typst.vim": { "branch": "main", "commit": "4d18ced62599ffe5b3c0e5e49566d5456121bc02" }, @@ -128,14 +128,14 @@ "vim-closetag": { "branch": "master", "commit": "d0a562f8bdb107a50595aefe53b1a690460c3822" }, "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" }, "vim-dadbod-completion": { "branch": "master", "commit": "8c9051c1cfc73fcf5bfe9a84db7097e4f7c0180d" }, - "vim-dadbod-ui": { "branch": "master", "commit": "d2ffc1bdae3041105f3b57423e0e81a5d9429267" }, + "vim-dadbod-ui": { "branch": "master", "commit": "f74a31e8c6c5a9dccc63450a09d5cd64a9294330" }, "vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" }, "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" }, - "vimtex": { "branch": "master", "commit": "fdb5618e05964e1cfcfd3bc1f2463ef3148ae8ff" }, - "which-key.nvim": { "branch": "main", "commit": "af4ded85542d40e190014c732fa051bdbf88be3d" }, + "vimtex": { "branch": "master", "commit": "80c9bc179784c30192d482741a43f176c859daa1" }, + "which-key.nvim": { "branch": "main", "commit": "c77cda8cd2f54965e4316699f1d124a2b3bf9d49" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }, - "zen-mode.nvim": { "branch": "main", "commit": "21976479c7a0146b05a42707cf91c86b1e510945" } -} \ No newline at end of file + "zen-mode.nvim": { "branch": "main", "commit": "2694c5a2bc4dc26c7a9e74b9e2b812920c90a830" } +} diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 408bd72..0e311e0 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -25,6 +25,7 @@ return { vimwiki = { "cbfmt", "markdownlint", "markdown-toc" }, json = { "jq" }, c = { "clang-format" }, + toml = { "taplo" }, cpp = { "clang-format" }, cmake = { "cmake_format" }, htmldjango = { "djlint", "rustywind" }, diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua index b5ce9f8..bf59926 100644 --- a/lua/plugins/dap.lua +++ b/lua/plugins/dap.lua @@ -31,6 +31,7 @@ return { require("dap-python").test_method() end, desc = "Test [M]ethod", + ft = "python", }, { "dpc", @@ -38,6 +39,7 @@ return { require("dap-python").test_class() end, desc = "Test [C]lass", + ft = "python", }, { "dps", @@ -45,6 +47,7 @@ return { require("dap-python").debug_selection() end, desc = "Debug [S]election", + ft = "python", }, { "dt", diff --git a/lua/plugins/which-key.lua b/lua/plugins/which-key.lua index 08c61fa..892f072 100644 --- a/lua/plugins/which-key.lua +++ b/lua/plugins/which-key.lua @@ -1,128 +1,127 @@ return { "folke/which-key.nvim", event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 300 - end, - config = function() - local wk = require("which-key") - wk.setup({ - window = { - border = "single", + dependencies = "nvim-tree/nvim-web-devicons", + version = "*", + opts = { + preset = "modern", + sort = { "alphanum", "local", "order", "group", "mod", "lower", "icase" }, + icons = { + rules = false, + }, + defaults = {}, + spec = { + { + mode = "v", + "s", + ":s///gI", + desc = "[s]ubstitute word", }, - }) + { + { "C", vim.cmd.bdelete, desc = "[C]lose Buffer" }, + { "c", group = "[C]url" }, + { "t", group = "[T]rouble" }, + { "g", group = "[G]it" }, + { "q", group = "Persistence" }, + { "l", group = "[L]SP" }, + { "w", group = "[W]orkspace" }, + { "p", group = "Telescope", { "pd", group = "[D]evelopment" } }, + { "z", group = "[Z]en" }, + { "o", group = "Action" }, + { "r", group = "[R]ust" }, + { "n", group = "Gitpat" }, + { "m", group = "[M]isc" }, + { "T", group = "Vim[T]ex" }, + { + "d", + group = "[D]AP", + { + "dp", + group = "[P]ython", + }, + }, + { + "L", + group = "[L]anguate settings", + { "Lc", "setlocal formatoptions-=cro", desc = "Disable autocomment" }, + { "LC", "setlocal formatoptions=cro", desc = "Enable autocomment" }, + { "Ls", "setlocal spell!", desc = "Toggle spellchecker" }, + { "Le", "setlocal spell spelllang=en_us", desc = "Enable English spellchecker" }, + { "Ll", "setlocal spell spelllang=lv_LV", desc = "Enable Latvian spellchecker" }, + { "LI", "setlocal autoindent", desc = "Enable autoindent" }, + { "Li", "setlocal noautoindent", desc = "Disable autoindent" }, + }, + { + "P", + group = "Templates", + { + { + "Pl", + group = "[L]atex", + cond = function() + return vim.bo.filetype == "lua" + end, - local opts = { - mode = "n", -- NORMAL mode - prefix = "", - buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings - silent = true, -- use `silent` when creating keymaps - noremap = true, -- use `noremap` when creating keymaps - nowait = true, -- use `nowait` when creating keymaps - } - local vopts = { - mode = "v", -- VISUAL mode - prefix = "", - buffer = nil, -- Global mappings. Specify a buffer number for buffer local mappings - silent = true, -- use `silent` when creating keymaps - noremap = true, -- use `noremap` when creating keymaps - nowait = true, -- use `nowait` when creating keymaps - } - -- NOTE: Prefer using : over as the latter avoids going back in normal-mode. - -- see https://neovim.io/doc/user/map.html#:map-cmd - local vmappings = { - s = { ":s///gI", "[s]ubstitute word" }, - } - - local mappings = { - C = { vim.cmd.bdelete, "[C]lose Buffer" }, - c = { name = "[C]url" }, - t = { name = "[T]rouble" }, - g = { name = "[G]it" }, - l = { name = "[L]SP" }, - w = { name = "LSP [W]orkspace" }, - p = { - name = "Telescope", - d = { name = "[D]evelopment" }, - }, - z = { name = "[Z]en" }, - r = { name = "[R]ust" }, - n = { name = "Gitpad" }, - m = { name = "Misc" }, - L = { - name = "[L]anguage settings", - c = { "setlocal formatoptions-=cro", "Disable autocomment" }, - C = { "setlocal formatoptions=cro", "Enable autocomment" }, - s = { "setlocal spell!", "Toggle spellchecker" }, - e = { "setlocal spell spelllang=en_us", "Enable English spellchecker" }, - l = { "setlocal spell spelllang=lv_LV", "Enable Lavian spellchecker" }, - I = { "setlocal autoindent", "Enable autoindent" }, - i = { "setlocal noautoindent", "Disable autoindent" }, - }, - d = { - name = "[D]AP", - p = { name = "[P]ython" }, - r = { name = "[R]ust" }, - }, - T = { name = "Vim[T]ex" }, - P = { - name = "Tem[p]lates", - l = { - name = "[L]aTeX", - p = { - function() - vim.cmd.read("~/Templates/LaTeX/PhilPaper.tex") - end, - "PhilPaper.tex", - }, - l = { - function() - vim.cmd.read("~/Templates/LaTeX/Letter.tex") - end, - "Letter.tex", - }, - g = { - function() - vim.cmd.read("~/Templates/LaTeX/Glossary.tex") - end, - "Glossary.tex", - }, - h = { - function() - vim.cmd.read("~/Templates/LaTeX/HandOut.tex") - end, - "HandOut.tex", - }, - b = { - function() - vim.cmd.read("~/Templates/LaTeX/PhilBeamer.tex") - end, - "PhilBeamer.tex", - }, - s = { - function() - vim.cmd.read("~/Templates/LaTeX/SubFile.tex") - end, - "SubFile.tex", - }, - r = { - function() - vim.cmd.read("~/Templates/LaTeX/Root.tex") - end, - "Root.tex", - }, - m = { - function() - vim.cmd.read("~/Templates/LaTeX/MultipleAnswer.tex") - end, - "MultipleAnswer.tex", + { + "Plp", + function() + vim.cmd.read("~/Templates/LaTeX/PhilPaper.tex") + end, + desc = "PhilPaper.tex", + }, + { + "Pll", + function() + vim.cmd.read("~/Templates/LaTeX/Letter.tex") + end, + desc = "Letter.tex", + }, + { + "Plg", + function() + vim.cmd.read("~/Templates/LaTeX/Glossary.tex") + end, + desc = "Glossary.tex", + }, + { + "Plh", + function() + vim.cmd.read("~/Templates/LaTeX/HandOut.tex") + end, + desc = "HandOut.tex", + }, + { + "Plb", + function() + vim.cmd.read("~/Templates/LaTeX/PhilBeamer.tex") + end, + desc = "PhilBeamer.tex", + }, + { + "Pls", + function() + vim.cmd.read("~/Templates/LaTeX/SubFile.tex") + end, + desc = "SubFile.tex", + }, + { + "Plr", + function() + vim.cmd.read("~/Templates/LaTeX/Root.tex") + end, + desc = "Root.tex", + }, + { + "Plm", + function() + vim.cmd.read("~/Templates/LaTeX/MultipleAnswer.tex") + end, + desc = "MultipleAnswer.tex", + }, + }, }, }, }, - } - - wk.register(mappings, opts) - wk.register(vmappings, vopts) - end, + }, + }, }