feat(neovim-utility): lazy loaded more plugins, moved motions to utility

.config/nvim/lazy-lock.json

@@ -1,5 +1,5 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
+  "Comment.nvim": { "branch": "fix-inline-visual-linewise-comment", "commit": "01019c2889fa6c63a80a223c55c1d28999b5c959" },
   "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
   "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
   "auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" },
@@ -15,12 +15,12 @@
   "darkstorm.nvim": { "branch": "master", "commit": "bab84a698e5a7bec92bd9d24acbd54554502e35e" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "edgy.nvim": { "branch": "main", "commit": "0e8bbab4eba9dab6c237e4a2e146dc0466897be6" },
-  "github-nvim-theme": { "branch": "main", "commit": "bd87e84120bf355432227b6e517967d3f566c6d9" },
+  "github-nvim-theme": { "branch": "main", "commit": "5fa5e70aad19643c97f90decf4d0a3ac58f4e95f" },
   "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
   "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" },
-  "lazy.nvim": { "branch": "main", "commit": "c92c6b5fd2b3a13c8999ab8379e43a79c9406e59" },
+  "lazy.nvim": { "branch": "main", "commit": "9a374a0fb4d3ac42dac4a129d4bead7252473c77" },
   "lazydev.nvim": { "branch": "main", "commit": "02f1055a777264d4b65896051ec28d0f322f7932" },
   "leap.nvim": { "branch": "main", "commit": "a9a9faee45066f2796c9a0e0ef52bf571d144492" },
   "lsp-progress.nvim": { "branch": "main", "commit": "d5f4d28efe75ce636bfbe271eb45f39689765aab" },
@@ -30,26 +30,26 @@
   "lspsaga.nvim": { "branch": "main", "commit": "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2" },
   "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
   "lush.nvim": { "branch": "main", "commit": "1b66ab197b177aabc2270a2c9cb8019fa5a367df" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "material.nvim": { "branch": "main", "commit": "b5d0ff3ad37ba00cea3dc3dce0b0f555b481c6f4" },
   "min-theme.nvim": { "branch": "main", "commit": "23ea3e1dd9e281973b4732cea0968f6d2ab72c47" },
-  "mini.nvim": { "branch": "main", "commit": "db52ea9a1fd5183bb15f557db3fd6e504099bf06" },
+  "mini.nvim": { "branch": "main", "commit": "eee6fb8efbeb5d792215de9a0bc9282603aa9fcc" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
   "neogit": { "branch": "master", "commit": "af1d8d88f426a4da63c913f3b81a37350dbe8d02" },
   "neovim": { "branch": "main", "commit": "9e4320d0bab7f261921d6af7d1c1bbc1a1e3dc67" },
   "nightfox.nvim": { "branch": "main", "commit": "df75a6a94910ae47854341d6b5a6fd483192c0eb" },
-  "none-ls.nvim": { "branch": "main", "commit": "8b5d4170a602d7b257704eef77b0539ddfd02589" },
+  "none-ls.nvim": { "branch": "main", "commit": "2cde745aadc2c36f6860a77a556494870675771a" },
   "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
-  "nvim": { "branch": "main", "commit": "7946d1a195c66fed38b3e34f9fa8e0c5a2da0700" },
+  "nvim": { "branch": "main", "commit": "0b5df9c9e641b1212b21a0762ccad4434fd41322" },
   "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" },
   "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
-  "nvim-lspconfig": { "branch": "master", "commit": "df9c116cbcf0aa7e58f2b36b0296fa687e87f36f" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e26da408cf955afa8e9ddbadd510e84ea8976cd7" },
   "nvim-spectre": { "branch": "master", "commit": "9a28f926d3371b7ef02243cbbb653a0478d06e31" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-treesitter": { "branch": "master", "commit": "874b99065b4b00b84b0ca5fa63490c93728a45ab" },
+  "nvim-treesitter": { "branch": "master", "commit": "667b9dbbfa2d0071c5677c429ddcf89fb931b53f" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
-  "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
+  "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
   "octo.nvim": { "branch": "master", "commit": "aa5dfa573220a0a511a25ee14ce1570b6c23e56a" },
   "oil.nvim": { "branch": "master", "commit": "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9" },
   "okai": { "branch": "main", "commit": "b028c2916c39b1c4ad53756d262f9d0576edac87" },
@@ -61,10 +61,10 @@
   "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
   "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" },
   "tokyonight.nvim": { "branch": "main", "commit": "1471dab694ad88351185758bb4275624d8b798ec" },
-  "trouble.nvim": { "branch": "main", "commit": "bf99ea71a39e322336b7f8be965f86dbf5c65540" },
+  "trouble.nvim": { "branch": "main", "commit": "ad8ef38666834e9e438f84bd446657445bc2a71e" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
   "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
   "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" },
   "vim-tmux-navigator": { "branch": "master", "commit": "5b3c701686fb4e6629c100ed32e827edf8dad01e" },
-  "vim-wakatime": { "branch": "master", "commit": "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23" }
+  "vim-wakatime": { "branch": "master", "commit": "d72aac70fcee172413f89621b65b5383bd845e4b" }
 }

.config/nvim/lua/custom/plugins/utility.lua

@@ -50,8 +50,8 @@ return {
     { 'nvim-pack/nvim-spectre', cmd = 'Spectre', config = true },
     {
         'echasnovski/mini.nvim',
-        lazy = true,
         version = false,
+        keys = {},
         init = function()
             local function quit_buffer()
                 if vim.bo.modified then
@@ -65,26 +65,46 @@ return {
     {
         'kylechui/nvim-surround',
         version = '*',
-        config = true,
+        lazy = false,
+        opts = {
+            keymaps = {
+                insert = false,
+                insert_line = false,
+                normal_line = false,
+                normal_cur_line = false,
+                visual_line = false,
+                normal = false,
+                normal_cur = false,
+                visual = false,
+                delete = false,
+                change = false,
+                -- normal = 'yS',
+                -- normal_cur = 'ySS',
+                -- visual = 'S',
+                -- delete = 'dS',
+                -- change = 'cW',
+            },
+        },
         keys = {
             { '(', '<Plug>(nvim-surround-visual)(', mode = 'v' },
-            { ')', '<Plug>(nvim-surround-visual))', mode = 'v' },
             { '{', '<Plug>(nvim-surround-visual){', mode = 'v' },
-            { '}', '<Plug>(nvim-surround-visual)}', mode = 'v' },
             { '[', '<Plug>(nvim-surround-visual)[', mode = 'v' },
             { '`', '<Plug>(nvim-surround-visual)`', mode = 'v' },
-            'cs',
-            'ds',
-            'ys',
+            { '"', '<Plug>(nvim-surround-visual)"', mode = 'v' },
+            { "'", "<Plug>(nvim-surround-visual)'", mode = 'v' },
+            -- { 'yS',  '<Plug>(nvim-surround-normal)' },
+            -- { 'ySS', '<Plug>(nvim-surround-normal-cur)' },
+            -- { 'S',   '<Plug>(nvim-surround-visual)',  mode = 'v' },
+            -- { 'cS', '<Plug>{ nvim-surround-change }' },
+            -- { 'dS', '<Plug>(nvim-surround-delete)' },
         },
     },
     {
         -- TODO: Make sure it uses a diff color
         -- the color rn is too similar to visual mode
         'RRethy/vim-illuminate',
-        config = function()
-            vim.keymap.set('n', '<leader>it', '<cmd>IlluminateToggle<cr>', { desc = '[I]lluminate [Tloggle]' })
-        end,
+        event = 'BufEnter',
+        keys = { { '<leader>it', '<cmd>IlluminateToggle<cr>', desc = '[I]lluminate [Tloggle]' } },
     },
     {
         'lukas-reineke/indent-blankline.nvim',
@@ -97,4 +117,59 @@ return {
             },
         },
     },
+    {
+        'christoomey/vim-tmux-navigator',
+        keys = {
+            { '<C-h>', '<cmd>TmuxNavigateLeft<cr>' },
+            { '<C-j>', '<cmd>TmuxNavigateDown<cr>' },
+            { '<C-k>', '<cmd>TmuxNavigateUp<cr>' },
+            { '<C-l>', '<cmd>TmuxNavigateRight<cr>' },
+        },
+    },
+    {
+        'ggandor/leap.nvim',
+        dependencies = { 'tpope/vim-repeat' },
+        keys = {
+            { 's', '<Plug>(leap)',            mode = { 'n', 'x', 'o' } },
+            { 'S', '<Plug>(leap-from-window)' },
+            {
+                'gs',
+                function()
+                    require('leap.remote').action()
+                end,
+            },
+        },
+        config = function()
+            -- Define equivalence classes for brackets and quotes, in addition to
+            -- the default whitespace group.
+            require('leap').opts.equivalence_classes = { ' \t\r\n', '([{', ')]}', '\'"`' }
+
+            -- Set background to gray in searchable area
+            vim.api.nvim_set_hl(0, 'LeapBackdrop', { fg = '#777777' })
+        end,
+    },
+    {
+        'windwp/nvim-autopairs',
+        event = 'InsertEnter',
+        config = true,
+    },
+    {
+        -- 'numToStr/Comment.nvim',
+        'os-mey/Comment.nvim',
+        branch = 'fix-inline-visual-linewise-comment',
+        event = 'BufEnter',
+        config = function()
+            require('Comment').setup()
+            local api = require('Comment.api')
+            local esc = vim.api.nvim_replace_termcodes('<ESC>', true, false, true)
+            local toggle_linewise_selection = function()
+                vim.api.nvim_feedkeys(esc, 'nx', false)
+                api.toggle.linewise(vim.fn.visualmode())
+            end
+
+            -- <C-_> means Ctrl slash, `_` is a `/`
+            vim.keymap.set('n', '<C-_>', api.toggle.linewise.current, { noremap = true, silent = true })
+            vim.keymap.set('v', '<C-_>', toggle_linewise_selection, { noremap = true, silent = true })
+        end,
+    },
 }