diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua index f28f0b3..7bdcb08 100644 --- a/home/.config/nvim/init.lua +++ b/home/.config/nvim/init.lua @@ -254,6 +254,7 @@ require('lazy').setup({ }, config = function() local leap = require 'leap' + leap.opts.highlight_unlabeled_phase_one_targets = true leap.opts.safe_labels = {} vim.keymap.set({ 'n', 'x', 'o' }, 's', '(leap-forward)') @@ -329,14 +330,13 @@ require('lazy').setup({ backdrop = 100, border = 'single', fullscreen = true, - ---@diagnostic disable-next-line: missing-fields preview = { border = 'single', }, previewers = { builtin = { syntax = true, - syntax_limit_b = 1024 * 64, + syntax_limit_b = 1024 * 64, -- syntax limit (bytes), 0=nolimit }, }, }, @@ -546,23 +546,55 @@ require('lazy').setup({ --[[ cfg_lazy_treesitter: Highlight, edit, and navigate code ]] { 'nvim-treesitter/nvim-treesitter', + dependencies = { + 'nvim-treesitter/nvim-treesitter-textobjects', + }, build = ':TSUpdate', config = function() - require('nvim-treesitter').setup() - --[[ cfg_lazy_treesitter_langs ]] - local ensure_installed = { - 'vim', - 'vimdoc', - 'lua', - 'javascript', - 'typescript', - 'tsx', - 'vue', - 'html', - 'css', - 'scss', + require('nvim-treesitter.configs').setup { + --[[ cfg_lazy_treesitter_langs ]] + ensure_installed = { + 'vim', + 'vimdoc', + 'lua', + 'javascript', + 'typescript', + 'tsx', + 'vue', + 'html', + 'css', + 'scss', + }, + auto_install = true, + highlight = { enable = true }, + indent = { enable = true }, + + --[[ cfg_lazy_treesitter_keymaps ]] + + incremental_selection = { + enable = true, + keymaps = { + init_selection = '', + node_incremental = '', + node_decremental = '', + scope_incremental = '', + }, + }, + textobjects = { + select = { + enable = true, + lookahead = true, + keymaps = { + ['aa'] = '@parameter.outer', + ['ia'] = '@parameter.inner', + ['af'] = '@function.outer', + ['if'] = '@function.inner', + ['ac'] = '@class.outer', + ['ic'] = '@class.inner', + }, + }, + }, } - require('nvim-treesitter').install(ensure_installed) end, }, --[[ cfg_lazy_onedark: Colorscheme inspired by Atom ]] diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 1640e1d..ccc9471 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -2,22 +2,23 @@ "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, - "desolate.nvim": { "branch": "develop", "commit": "a281949d98972ea08bee651bf95ede70b378c500" }, - "fzf": { "branch": "master", "commit": "838ac7554bdbae2f457f2c4969e1b38f1c28c946" }, - "fzf-lua": { "branch": "main", "commit": "988416cc782dfe28bff3f0da9b8c943b236cd86a" }, - "gitsigns.nvim": { "branch": "main", "commit": "25050e4ed39e628282831d4cbecb1850454ce915" }, + "desolate.nvim": { "branch": "develop", "commit": "08c59bb2d9e805b206e8128a698bb839a189f1ae" }, + "fzf": { "branch": "master", "commit": "4a684b6c784111d4aa15c2532381273d742af97b" }, + "fzf-lua": { "branch": "main", "commit": "b2c0603216adb92c6bba81053bc996d7ae95b77a" }, + "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, - "leap.nvim": { "branch": "main", "commit": "59d70b1bdf8e76e0637e6ebcc150fb6767f67fc5" }, - "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" }, + "leap.nvim": { "branch": "main", "commit": "eda0138a408a5600c45e324c69fe73c9df30939c" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "lush.nvim": { "branch": "main", "commit": "9c60ec2279d62487d942ce095e49006af28eed6e" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0a695750d747db1e7e70bcf0267ef8951c95fc83" }, - "mason.nvim": { "branch": "main", "commit": "16ba83bfc8a25f52bb545134f5bee082b195c460" }, - "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "664c0b7cea1de71f8b65dfe951b7996fc3e6ccde" }, - "nvim-lspconfig": { "branch": "master", "commit": "07dff35e7c95288861200b788ef32d6103f107f0" }, - "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, - "onedark.nvim": { "branch": "master", "commit": "df4792accde9db0043121f32628bcf8e645d9aea" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "21c2a84ce368e99b18f52ab348c4c02c32c02fcf" }, + "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, + "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "338409dd8a6ed74767bad3eb5269f1b903ffb3cf" }, + "nvim-lspconfig": { "branch": "master", "commit": "44acfe887d4056f704ccc4f17513ed41c9e2b2e6" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, + "onedark.nvim": { "branch": "master", "commit": "213c23ae45a04797572242568d5d51937181792d" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } }