diff --git a/modules/home-manager/cli/neovim/files/lualine.lua b/modules/home-manager/cli/neovim/files/lualine.lua
index 0c5854b..fdf4119 100644
--- a/modules/home-manager/cli/neovim/files/lualine.lua
+++ b/modules/home-manager/cli/neovim/files/lualine.lua
@@ -7,6 +7,12 @@ require('lualine').setup {
         disabled_filetypes = {},
         always_divide_middle = true,
         globalstatus = true,
+        -- reduce performance impact reducing refresh pace
+        refresh = {
+          statusline = 1500,
+          tabline = 1500,
+          winbar = 1500,
+        }
     },
     sections = {
         lualine_a = {'mode'},
diff --git a/modules/home-manager/cli/neovim/files/options.lua b/modules/home-manager/cli/neovim/files/options.lua
index 2dd3332..a33b8c4 100644
--- a/modules/home-manager/cli/neovim/files/options.lua
+++ b/modules/home-manager/cli/neovim/files/options.lua
@@ -1,4 +1,5 @@
 -- General Option
+vim.opt.syntax = "off";
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
@@ -9,7 +10,17 @@ vim.opt.clipboard = 'unnamedplus'      --Use system clipboard
 vim.opt.colorcolumn = '80'
 vim.opt.directory = os.getenv("HOME") .. '/.local/tmp/nvim'
 vim.opt.expandtab = true
-vim.opt.foldmethod = 'syntax'
+
+-- Foldling code
+-- Based on threesitter
+vim.opt.foldmethod = "expr"
+vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+vim.opt.foldcolumn = "0"
+vim.opt.foldtext = ""
+vim.opt.foldlevel = 99                -- I don't wand code to be fold by default
+vim.opt.foldlevelstart = 1
+vim.opt.foldnestmax = 2               -- max nested fold, 2 seems to be quite sufficient
+
 vim.opt.gdefault = true 	            -- search: all occurrences by default
 vim.opt.hlsearch = true 	            -- search: hightlight terms
 vim.opt.ignorecase = true
@@ -102,3 +113,11 @@ vim.api.nvim_set_keymap('n', '<leader>/', ':nohlsearch<CR>', opts)
 vim.api.nvim_set_keymap('n', '<Leader>]', ':tabnext<CR>', opts)
 vim.api.nvim_set_keymap('n', '<Leader>[', ':tabprev<CR>', opts)
 vim.api.nvim_set_keymap('n', '<leader>l', ':set list!<CR>', {silent = true})
+
+-- disable lsplog
+-- This is not usefull on a daily basis and should positively impact performance
+vim.lsp.set_log_level("off")
+
+-- define a timeout for match parens
+vim.g.matchparen_timeout = 2
+vim.g.matchparen_insert_timeout = 2