From 59b58486cd1daca8147d16e0816f74cee3118c0a Mon Sep 17 00:00:00 2001 From: undrpaidtekmnky Date: Fri, 6 Dec 2024 06:05:44 -0700 Subject: [PATCH] Added foldnav and modified keybinds --- init.lua | 2 +- lazy-lock.json | 13 ++++++------ lazyvim.json | 2 +- lua/mappings.lua | 20 +++++++++---------- lua/plugins/foldnav-nvim.lua | 38 ++++++++++++++++++++++++++++++++++++ 5 files changed, 57 insertions(+), 18 deletions(-) create mode 100644 lua/plugins/foldnav-nvim.lua diff --git a/init.lua b/init.lua index 4093fc0..1e8639b 100644 --- a/init.lua +++ b/init.lua @@ -39,7 +39,7 @@ vim.schedule(function() require("mappings") end) -require("toggleterm").setup({}) +require("toggleterm").setup() require("noice").setup({ popupmenu = { diff --git a/lazy-lock.json b/lazy-lock.json index 777a4a5..04959bd 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -19,8 +19,9 @@ "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "flit.nvim": { "branch": "main", "commit": "1ef72de6a02458d31b10039372c8a15ab8989e0d" }, + "foldnav.nvim": { "branch": "main", "commit": "43ce7078cd4ebcf932f27569669b09f031680b06" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "fzf-lua": { "branch": "main", "commit": "ed6539e018a522f176ad1f1ee6cb2e0172e8379a" }, + "fzf-lua": { "branch": "main", "commit": "14e8ac0173009035e975f8582cfae817b455a700" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "grug-far.nvim": { "branch": "main", "commit": "4b19888719e45ed696d140af2e4e4e3840a5387a" }, "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" }, @@ -51,7 +52,7 @@ "neogit": { "branch": "master", "commit": "11e14b67eb19bada54c9eb8bc70a581f358cd175" }, "neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" }, "neotest-python": { "branch": "master", "commit": "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e" }, - "noice.nvim": { "branch": "main", "commit": "d5451b0d0e166e79aaabd79a04fc1cf185cc5b4d" }, + "noice.nvim": { "branch": "main", "commit": "72e21399c7b292a2470d9230bf63cad5d6375140" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-ansible": { "branch": "main", "commit": "44dabdaa8a9193b7f564a8408ed6d7107705030a" }, "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" }, @@ -60,7 +61,7 @@ "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" }, "nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" }, - "nvim-lspconfig": { "branch": "master", "commit": "2c007c79eedfca0ec652c50d571cb0c52d1577ba" }, + "nvim-lspconfig": { "branch": "master", "commit": "64073cbed0ce23e988160bfd1a148a75b6af94cc" }, "nvim-metals": { "branch": "main", "commit": "f861db9fda55939797ac1b05238c49b0dcdc3bdb" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, @@ -68,7 +69,7 @@ "nvim-numbertoggle": { "branch": "main", "commit": "c5827153f8a955886f1b38eaea6998c067d2992f" }, "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, "nvim-tree.lua": { "branch": "master", "commit": "ca7c4c33cac2ad66ec69d45e465379716ef0cc97" }, - "nvim-treesitter": { "branch": "master", "commit": "acada1a685f5decd0f10e1672963bf3425eafa45" }, + "nvim-treesitter": { "branch": "master", "commit": "c56507f6a16d6a9bd73ab8827a49fa5533aa8fc3" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" }, @@ -79,7 +80,7 @@ "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "render-markdown.nvim": { "branch": "main", "commit": "7674543331701d05dc9f878e1fe62d1107dc2f5e" }, + "render-markdown.nvim": { "branch": "main", "commit": "a7097f372ba8f8866cda5e98d5bc828f2856c96c" }, "snacks.nvim": { "branch": "main", "commit": "974bccb126b6b5d7170c519c380207069d23f557" }, "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, @@ -87,7 +88,7 @@ "tokyonight.nvim": { "branch": "main", "commit": "15d83cda572d7498b43bbdaa223bc75bf341183e" }, "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, "ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" }, - "ui": { "branch": "v3.0", "commit": "7905539f1e10f460811dc0db800355611f8a527a" }, + "ui": { "branch": "v3.0", "commit": "19fe47b4ecca1f4e63323ed0c081d21fc9927a36" }, "venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" }, "vim-cmake": { "branch": "master", "commit": "896bc2189c8ade62d00a0ebedc59c65d9d9b0d65" }, "vim-dadbod": { "branch": "master", "commit": "fe5a55e92b2dded7c404006147ef97fb073d8b1b" }, diff --git a/lazyvim.json b/lazyvim.json index cd57712..844c68e 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -41,4 +41,4 @@ "NEWS.md": "7429" }, "version": 7 -} +} \ No newline at end of file diff --git a/lua/mappings.lua b/lua/mappings.lua index 1f15024..46c8305 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -16,18 +16,18 @@ keymap("", "cb", ":CMakeBuild", {}) keymap("", "cq", ":CMakeClose", {}) keymap("", "cc", ":CMakeClean", {}) -keymap("", "nt", ":ToggleTerm", {}) +keymap("", "nt", ":ToggleTerm direction=tab", {}) function _G.set_terminal_keymaps() - local opts = {buffer = 0} - vim.keymap.set('t', '', [[]], opts) - vim.keymap.set('t', 'jk', [[]], opts) - vim.keymap.set('t', '', [[wincmd h]], opts) - vim.keymap.set('t', '', [[wincmd j]], opts) - vim.keymap.set('t', '', [[wincmd k]], opts) - vim.keymap.set('t', '', [[wincmd l]], opts) - vim.keymap.set('t', '', [[]], opts) + local opts = { buffer = 0 } + vim.keymap.set("t", "", [[]], opts) + vim.keymap.set("t", "jk", [[]], opts) + vim.keymap.set("t", "", [[wincmd h]], opts) + vim.keymap.set("t", "", [[wincmd j]], opts) + vim.keymap.set("t", "", [[wincmd k]], opts) + vim.keymap.set("t", "", [[wincmd l]], opts) + vim.keymap.set("t", "", [[]], opts) end -- if you only want these mappings for toggle term use term://*toggleterm#* instead -vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()') +vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()") diff --git a/lua/plugins/foldnav-nvim.lua b/lua/plugins/foldnav-nvim.lua new file mode 100644 index 0000000..9ae713f --- /dev/null +++ b/lua/plugins/foldnav-nvim.lua @@ -0,0 +1,38 @@ +return { + "domharries/foldnav.nvim", + version = "*", + config = function() + vim.g.foldnav = { + flash = { + enabled = true, + }, + } + end, + keys = { + { + "", + function() + require("foldnav").goto_start() + end, + }, + { + "", + function() + require("foldnav").goto_next() + end, + }, + { + "", + function() + require("foldnav").goto_prev_start() + end, + }, + -- { "", function() require("foldnav").goto_prev_end() end }, + { + "", + function() + require("foldnav").goto_end() + end, + }, + }, +}