Merge commit '494f5f471dd5f37ed09b1eb665e9abf5ac6c3f7f'

2 files changed, 23 insertions, 25 deletions

diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
index b081ca3..7f481d3 100644
--- a/.config/nvim/lua/plugins/treesitter.lua
+++ b/.config/nvim/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/.config/nvim/lua/user/opts.lua b/.config/nvim/lua/user/opts.lua
index ce12c8c..13e9c1c 100644
--- a/.config/nvim/lua/user/opts.lua
+++ b/.config/nvim/lua/user/opts.lua
@@ -18,6 +18,7 @@ vim.cmd([[
 
 -- Fast macros without lazyredraw
 vim.cmd([[
+    set re=0
     nnoremap @ <cmd>execute "noautocmd norm! " . v:count1 . "@" . getcharstr()<cr>
     xnoremap @ :<C-U>execute "noautocmd '<,'>norm! " . v:count1 . "@" . getcharstr()<cr>
 ]])
@@ -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
+--]])