From 6fd4baa9fe2f1d1f0b4b051497614672bbef934a Mon Sep 17 00:00:00 2001 From: Proctor Date: Mon, 13 Apr 2026 17:48:53 -0500 Subject: [PATCH] nvim: update zoom-toggle keybindings --- .../.config/nvim/fnl/dotfiles/zoom-toggle.fnl | 18 +- nvim/.config/nvim/lazy-lock.json | 225 ++++++++++++++---- .../.config/nvim/lua/dotfiles/zoom-toggle.lua | 8 +- 3 files changed, 198 insertions(+), 53 deletions(-) diff --git a/nvim/.config/nvim/fnl/dotfiles/zoom-toggle.fnl b/nvim/.config/nvim/fnl/dotfiles/zoom-toggle.fnl index 3454a99..437e987 100644 --- a/nvim/.config/nvim/fnl/dotfiles/zoom-toggle.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/zoom-toggle.fnl @@ -1,3 +1,5 @@ +(import-macros {: tx} :config.macros) + (local u (require :dotfiles.util)) (var unzoom! nil) @@ -9,10 +11,18 @@ (set unzoom! nil)) (do (set unzoom! (vim.fn.winrestcmd)) - (vim.fn.resize) - (vim.fn.vertical :resize)))) + (vim.cmd.resize) + (vim.cmd.resize {:mods {:vertical true}})))) + (vim.api.nvim_create_user_command :ZoomToggle zoom-toggle {}) -(u.nnoremap : ":call ZoomToggle()") -(u.tnoremap : ":call ZoomToggle()") +;; (u.nnoremap : ":call ZoomToggle()") +;; (u.tnoremap : ":call ZoomToggle()") + +(let [wk (require :which-key)] + (wk.add [[(tx : zoom-toggle + {:desc "Toggle zoom of buffer window"})] + [(tx : zoom-toggle + {:desc "Toggle zoom of buffer window" + :mode [:n :t] })]] )) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 0539029..e9ed111 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,47 +1,182 @@ { - "asyncrun.vim": { "branch": "master", "commit": "98d3c0fdeb983f0ef62fe3a49da440f6d2c045ce" }, - "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, - "cmp-conjure": { "branch": "master", "commit": "8c9a88efedc0e5bf3165baa6af8a407afe29daf6" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, - "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, - "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" }, - "conjure": { "branch": "main", "commit": "f66b3e7f45d325bd556cd785502761e583971920" }, - "fennel.vim": { "branch": "main", "commit": "0a5c89e7f31d2721a36f7043ee98e24e22e6325e" }, - "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason-update-all": { "branch": "main", "commit": "332aa2586295f93a32643eb2b580f899458215a1" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e" }, - "nfnl": { "branch": "main", "commit": "ac0177c5549df7abba7a19554c18a7765386c894" }, - "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, - "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, - "nvim-lspconfig": { "branch": "master", "commit": "8a9378a822719346a0288fa004dab302ca3c0a8f" }, - "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, - "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, - "nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" }, - "paredit": { "branch": "master", "commit": "60203e50698ed2211b4434a66ab2258a1a6ac3b5" }, - "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, - "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "aab6caaffd79b8def22ec4320a5344f7c42f58d2" }, - "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, - "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" }, - "vim-dadbod": { "branch": "master", "commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770" }, - "vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" }, - "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }, - "vim-git": { "branch": "master", "commit": "485e38f29494e46a9998100e707c755d114155f1" }, - "vim-gitgutter": { "branch": "main", "commit": "21c977e8597c468c7dc76001389b0b430d46a4b0" }, - "vim-pathogen": { "branch": "master", "commit": "ac4dd9494fa9008754e49dff85bff1b5746c89b4" }, - "vim-rails": { "branch": "master", "commit": "b0a5c76f86ea214ade36ab0b811e730c3f0add67" }, - "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, - "vim-rhubarb": { "branch": "master", "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" }, - "vim-solarized8": { "branch": "neovim", "commit": "1d05915cc9050ce1a8a6b94d8c2e48ead197c756" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "vim-unimpaired": { "branch": "master", "commit": "db65482581a28e4ccf355be297f1864a4e66985c" }, - "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" }, - "vim-vsnip": { "branch": "master", "commit": "9bcfabea653abdcdac584283b5097c3f8760abaa" }, - "vim-vsnip-integ": { "branch": "master", "commit": "c7c93934dece8315db3649bdc6898b76358a8b8d" }, - "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } + "asyncrun.vim": { + "branch": "master", + "commit": "98d3c0fdeb983f0ef62fe3a49da440f6d2c045ce" + }, + "cmp-buffer": { + "branch": "main", + "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" + }, + "cmp-cmdline": { + "branch": "main", + "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" + }, + "cmp-conjure": { + "branch": "master", + "commit": "8c9a88efedc0e5bf3165baa6af8a407afe29daf6" + }, + "cmp-nvim-lsp": { + "branch": "main", + "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" + }, + "cmp-path": { + "branch": "main", + "commit": "c642487086dbd9a93160e1679a1327be111cbc25" + }, + "conform.nvim": { + "branch": "master", + "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" + }, + "conjure": { + "branch": "main", + "commit": "f66b3e7f45d325bd556cd785502761e583971920" + }, + "fennel.vim": { + "branch": "main", + "commit": "0a5c89e7f31d2721a36f7043ee98e24e22e6325e" + }, + "lazy.nvim": { + "branch": "main", + "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" + }, + "lsp-colors.nvim": { + "branch": "main", + "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" + }, + "mason-lspconfig.nvim": { + "branch": "main", + "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" + }, + "mason-update-all": { + "branch": "main", + "commit": "332aa2586295f93a32643eb2b580f899458215a1" + }, + "mason.nvim": { + "branch": "main", + "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" + }, + "neo-tree.nvim": { + "branch": "v3.x", + "commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e" + }, + "nfnl": { + "branch": "main", + "commit": "ac0177c5549df7abba7a19554c18a7765386c894" + }, + "nui.nvim": { + "branch": "main", + "commit": "de740991c12411b663994b2860f1a4fd0937c130" + }, + "nvim-autopairs": { + "branch": "master", + "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" + }, + "nvim-cmp": { + "branch": "main", + "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" + }, + "nvim-lspconfig": { + "branch": "master", + "commit": "8a9378a822719346a0288fa004dab302ca3c0a8f" + }, + "nvim-notify": { + "branch": "master", + "commit": "8701bece920b38ea289b457f902e2ad184131a5d" + }, + "nvim-treesitter": { + "branch": "main", + "commit": "4916d6592ede8c07973490d9322f187e07dfefac" + }, + "nvim-web-devicons": { + "branch": "master", + "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" + }, + "paredit": { + "branch": "master", + "commit": "60203e50698ed2211b4434a66ab2258a1a6ac3b5" + }, + "plenary.nvim": { + "branch": "master", + "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" + }, + "popup.nvim": { + "branch": "master", + "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" + }, + "rainbow-delimiters.nvim": { + "branch": "master", + "commit": "aab6caaffd79b8def22ec4320a5344f7c42f58d2" + }, + "telescope.nvim": { + "branch": "master", + "commit": "5255aa27c422de944791318024167ad5d40aad20" + }, + "toggleterm.nvim": { + "branch": "main", + "commit": "9a88eae817ef395952e08650b3283726786fb5fb" + }, + "vim-dadbod": { + "branch": "master", + "commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770" + }, + "vim-dispatch": { + "branch": "master", + "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" + }, + "vim-fugitive": { + "branch": "master", + "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" + }, + "vim-git": { + "branch": "master", + "commit": "485e38f29494e46a9998100e707c755d114155f1" + }, + "vim-gitgutter": { + "branch": "main", + "commit": "21c977e8597c468c7dc76001389b0b430d46a4b0" + }, + "vim-pathogen": { + "branch": "master", + "commit": "ac4dd9494fa9008754e49dff85bff1b5746c89b4" + }, + "vim-rails": { + "branch": "master", + "commit": "b0a5c76f86ea214ade36ab0b811e730c3f0add67" + }, + "vim-repeat": { + "branch": "master", + "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" + }, + "vim-rhubarb": { + "branch": "master", + "commit": "5496d7c94581c4c9ad7430357449bb57fc59f501" + }, + "vim-solarized8": { + "branch": "neovim", + "commit": "1d05915cc9050ce1a8a6b94d8c2e48ead197c756" + }, + "vim-surround": { + "branch": "master", + "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" + }, + "vim-unimpaired": { + "branch": "master", + "commit": "db65482581a28e4ccf355be297f1864a4e66985c" + }, + "vim-vinegar": { + "branch": "master", + "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" + }, + "vim-vsnip": { + "branch": "master", + "commit": "9bcfabea653abdcdac584283b5097c3f8760abaa" + }, + "vim-vsnip-integ": { + "branch": "master", + "commit": "c7c93934dece8315db3649bdc6898b76358a8b8d" + }, + "which-key.nvim": { + "branch": "main", + "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" + } } diff --git a/nvim/.config/nvim/lua/dotfiles/zoom-toggle.lua b/nvim/.config/nvim/lua/dotfiles/zoom-toggle.lua index a952735..b5debfe 100644 --- a/nvim/.config/nvim/lua/dotfiles/zoom-toggle.lua +++ b/nvim/.config/nvim/lua/dotfiles/zoom-toggle.lua @@ -8,10 +8,10 @@ local function zoom_toggle() return nil else unzoom_21 = vim.fn.winrestcmd() - vim.fn.resize() - return vim.fn.vertical("resize") + vim.cmd.resize() + return vim.cmd.resize({mods = {vertical = true}}) end end vim.api.nvim_create_user_command("ZoomToggle", zoom_toggle, {}) -u.nnoremap("", ":call ZoomToggle()") -return u.tnoremap("", ":call ZoomToggle()") +local wk = require("which-key") +return wk.add({{{"", zoom_toggle, desc = "Toggle zoom of buffer window"}}, {{"", zoom_toggle, desc = "Toggle zoom of buffer window", mode = {"n", "t"}}}})