From 6f5b9376a633b352a3567c03ffbc5bba319de4d9 Mon Sep 17 00:00:00 2001 From: srdusr Date: Sat, 28 Jan 2023 15:54:18 +0200 Subject: Squashed '.config/nvim/' changes from ba871ed..5fad252 5fad252 Fixed autocmd highlight issue by 'highlight = { enable = false, },' 75e5572 Set re=0 option to fix exceeding redraw limit git-subtree-dir: .config/nvim git-subtree-split: 5fad25277ad5f0d08b8edba670c4143f6dc46ed7 --- lua/plugins/treesitter.lua | 29 +++++++++++++---------------- lua/user/opts.lua | 19 ++++++++++--------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index b081ca3..7f481d3 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -1,16 +1,6 @@ -local status, treesitter = pcall(require, "nvim-treesitter.configs") -if (not status) then return end +require'nvim-treesitter.configs'.setup { + -- A list of parser names, or "all" (the four listed parsers should always be installed) -treesitter.setup { - highlight = { - enable = true, - disable = {}, - }, - indent = { - enable = true, - disable = {}, - --disable = { "python", "css" } - }, ensure_installed = { "c", "bash", @@ -19,13 +9,20 @@ treesitter.setup { }, --ensure_installed = "all", -- one of "all" or a list of languages --ignore_install = { "" }, -- List of parsers to ignore installing + sync_install = false, + auto_install = true, + highlight = { + enable = false, + disable = {}, + }, + indent = { + enable = true, + disable = {}, + --disable = { "python", "css" } + }, autotag = { enable = true, }, - efactor = { - highlight_definitions = { enable = true }, - highlight_current_scope = { enable = true } - } } --vim.opt.foldmethod = "expr" --vim.opt.foldexpr = "nvim_treesitter#foldexpr()" diff --git a/lua/user/opts.lua b/lua/user/opts.lua index ce12c8c..13e9c1c 100644 --- a/lua/user/opts.lua +++ b/lua/user/opts.lua @@ -18,6 +18,7 @@ vim.cmd([[ -- Fast macros without lazyredraw vim.cmd([[ + set re=0 nnoremap @ execute "noautocmd norm! " . v:count1 . "@" . getcharstr() xnoremap @ :execute "noautocmd '<,'>norm! " . v:count1 . "@" . getcharstr() ]]) @@ -237,12 +238,12 @@ vim.cmd([[ " Only show in insert mode ]]) -- Line Return -vim.cmd([[ " Return to the same line when we reopen a file - augroup line_return - au! - au BufReadPost * - \ if line("'\"") > 0 && line("'\"") <= line("$") | - \ execute 'normal! g`"zvzz' | - \ endif - augroup END -]]) +--vim.cmd([[ " Return to the same line when we reopen a file +-- augroup line_return +-- au! +-- au BufReadPost * +-- \ if line("'\"") > 0 && line("'\"") <= line("$") | +-- \ execute 'normal! g`"zvzz' | +-- \ endif +-- augroup END +--]]) -- cgit v1.2.3